Remove libomp-test package
We aren't using this package for testing anymore, because it was too hard maintain and keep working.
This commit is contained in:
Tom Stellard
parent
a286411376
commit
8c3e353313
46
libomp.spec
46
libomp.spec
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
Name: libomp
|
||||
Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: OpenMP runtime for clang
|
||||
|
||||
License: Apache-2.0 WITH LLVM-exception OR NCSA
|
||||
|
|
@ -26,8 +26,6 @@ URL: http://openmp.llvm.org
|
|||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz
|
||||
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig
|
||||
Source2: release-keys.asc
|
||||
Source3: run-lit-tests
|
||||
Source4: lit.fedora.cfg.py
|
||||
|
||||
BuildRequires: clang
|
||||
# For clang-offload-packager
|
||||
|
|
@ -63,17 +61,6 @@ Requires: clang-resource-filesystem%{?isa} = %{version}
|
|||
%description devel
|
||||
OpenMP header files.
|
||||
|
||||
%package test
|
||||
Summary: OpenMP regression tests
|
||||
Requires: %{name}%{?isa} = %{version}-%{release}
|
||||
Requires: %{name}-devel%{?isa} = %{version}-%{release}
|
||||
Requires: clang
|
||||
Requires: llvm
|
||||
Requires: python3-lit
|
||||
|
||||
%description test
|
||||
OpenMP regression tests
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%autosetup -n %{libomp_srcdir} -p2
|
||||
|
|
@ -99,30 +86,6 @@ OpenMP regression tests
|
|||
%install
|
||||
%cmake_install
|
||||
|
||||
# Test package setup
|
||||
%global libomp_srcdir %{_datadir}/libomp/src/
|
||||
%global libomp_testdir %{libomp_srcdir}/runtime/test/
|
||||
%global lit_cfg %{libomp_testdir}/%{_arch}.site.cfg.py
|
||||
%global lit_fedora_cfg %{_datadir}/libomp/lit.fedora.cfg.py
|
||||
|
||||
install -d %{buildroot}%{libomp_srcdir}/runtime
|
||||
cp -R runtime/test %{buildroot}%{libomp_srcdir}/runtime
|
||||
cp -R runtime/src %{buildroot}%{libomp_srcdir}/runtime
|
||||
|
||||
# Generate lit config files. Strip off the last line that initiates the
|
||||
# test run, so we can customize the configuration.
|
||||
head -n -1 %{_vpath_builddir}/runtime/test/lit.site.cfg >> %{buildroot}%{lit_cfg}
|
||||
|
||||
# Install custom fedora config file
|
||||
cp %{SOURCE4} %{buildroot}%{lit_fedora_cfg}
|
||||
|
||||
# Patch lit config files to load custom fedora config
|
||||
echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> %{buildroot}%{lit_cfg}
|
||||
|
||||
# Install test script
|
||||
install -d %{buildroot}%{_libexecdir}/tests/libomp
|
||||
install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/libomp
|
||||
|
||||
# Remove static libraries with equivalent shared libraries
|
||||
rm -rf %{buildroot}%{_libdir}/libarcher_static.a
|
||||
|
||||
|
|
@ -169,11 +132,10 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
|
|||
%{_libdir}/libomptarget.so
|
||||
%endif
|
||||
|
||||
%files test
|
||||
%{_datadir}/libomp
|
||||
%{_libexecdir}/tests/libomp/
|
||||
|
||||
%changelog
|
||||
* Sat Jun 17 2023 Tom Stellard <tstellar@redhat.com> - 16.0.5-3
|
||||
- Remove libomp-test package
|
||||
|
||||
* Thu Jun 15 2023 Nikita Popov <npopov@redhat.com> - 16.0.5-2
|
||||
- Use llvm-cmake-utils package
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
import tempfile
|
||||
|
||||
compiler = '%(libomp_compiler)s' % lit_config.params
|
||||
config.test_filecheck = '%(bindir)s/FileCheck' % lit_config.params
|
||||
config.omp_header_directory = '%(includedir)s' % lit_config.params
|
||||
config.libomp_obj_root = tempfile.mkdtemp()
|
||||
config.library_dir = '%(libdir)s' % lit_config.params
|
||||
test_root = '%(libomp_test_root)s' % lit_config.params
|
||||
|
||||
# Lit will default to the compiler used to build openmp, which is gcc, but we
|
||||
# want to run the tests using clang.
|
||||
config.test_compiler_features = ['clang']
|
||||
config.test_c_compiler = 'clang'
|
||||
config.test_cxx_compiler = 'clang++'
|
||||
lit_config.load_config(config, '%(libomp_test_root)s/lit.cfg' % lit_config.params)
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
#!/usr/bin/bash
|
||||
|
||||
usage() {
|
||||
echo "usage: `basename $0` [OPTIONS]"
|
||||
echo " --threads NUM The number of threads to use for running tests."
|
||||
}
|
||||
|
||||
|
||||
threads_arg=''
|
||||
|
||||
while [ $# -gt 0 ]; do
|
||||
case $1 in
|
||||
--threads)
|
||||
shift
|
||||
threads_arg="--threads $1"
|
||||
;;
|
||||
--multilib-arch)
|
||||
shift
|
||||
ARCH=$1
|
||||
;;
|
||||
* )
|
||||
echo "unknown option: $1"
|
||||
echo ""
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
|
||||
set -xe
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
ARCH=`rpm --eval '%_arch'`
|
||||
fi
|
||||
|
||||
case $ARCH in
|
||||
arm)
|
||||
;&
|
||||
i686)
|
||||
LIB_DIR="/usr/lib/"
|
||||
;;
|
||||
*)
|
||||
LIB_DIR="/usr/lib64/"
|
||||
;;
|
||||
esac
|
||||
|
||||
BIN_DIR="/usr/bin/"
|
||||
INCLUDE_DIR="/usr/include/"
|
||||
|
||||
lit $threads_arg -v \
|
||||
--config-prefix $ARCH \
|
||||
-Dlibomp_compiler=clang \
|
||||
-Dbindir=$BIN_DIR \
|
||||
-Dlibdir=$LIB_DIR \
|
||||
-Dincludedir=$INCLUDE_DIR \
|
||||
-Dlibomp_test_root=/usr/share/libomp/src/runtime/test \
|
||||
/usr/share/libomp/src/runtime/test
|
||||
Loading…
Reference in New Issue