Update tests to work with dnf5

This commit is contained in:
Tom Stellard 2023-06-30 18:56:30 +00:00
parent 2f741f9841
commit dff3d6a440
6 changed files with 7 additions and 4 deletions

View File

@ -4,6 +4,7 @@ summary: >
require: require:
- annobin-annocheck - annobin-annocheck
- dnf5-plugins
- gcc - gcc
- gcc-c++ - gcc-c++
- make - make

View File

@ -2,6 +2,6 @@
set -ex set -ex
dnf -y build-dep test.spec dnf -y builddep test.spec
rpmbuild --define '_sourcedir .' --define '_builddir .' -bi test.spec rpmbuild --define '_sourcedir .' --define '_builddir .' -bi test.spec
rpmbuild --without auto_set_build_flags --define '_sourcedir .' --define '_builddir .' -bi test.spec rpmbuild --without auto_set_build_flags --define '_sourcedir .' --define '_builddir .' -bi test.spec

View File

@ -2,6 +2,7 @@ Summary: Test that the brp-llvm-compile-lto-elf script is working correctly
require: require:
- dnf-plugins-core - dnf-plugins-core
- dnf5-plugins
- redhat-rpm-config - redhat-rpm-config
- rpm-build - rpm-build

View File

@ -5,7 +5,7 @@ set -ex
lib_dir=brp-llvm-compile-lto-elf-test-lib lib_dir=brp-llvm-compile-lto-elf-test-lib
lib_spec=$lib_dir/brp-llvm-compile-lto-elf-test-lib.spec lib_spec=$lib_dir/brp-llvm-compile-lto-elf-test-lib.spec
dnf -y build-dep $lib_spec dnf -y builddep $lib_spec
rpmbuild --define "_sourcedir ." --define "_builddir ./$lib_dir" --define "_rpmdir ." -bb $lib_spec rpmbuild --define "_sourcedir ." --define "_builddir ./$lib_dir" --define "_rpmdir ." -bb $lib_spec
dnf -y install ./`rpm --eval '%{_arch}'`/*.rpm dnf -y install ./`rpm --eval '%{_arch}'`/*.rpm
@ -13,5 +13,5 @@ dnf -y install ./`rpm --eval '%{_arch}'`/*.rpm
test_dir=brp-llvm-compile-lto-elf-test test_dir=brp-llvm-compile-lto-elf-test
test_spec=$test_dir/brp-llvm-compile-lto-elf-test.spec test_spec=$test_dir/brp-llvm-compile-lto-elf-test.spec
dnf -y build-dep $test_spec dnf -y builddep $test_spec
rpmbuild --define "_sourcedir ." --define "_builddir ./$test_dir" -bi $test_spec rpmbuild --define "_sourcedir ." --define "_builddir ./$test_dir" -bi $test_spec

View File

@ -2,5 +2,6 @@ summary: self-build test
require: require:
- dnf-plugins-core - dnf-plugins-core
- dnf5-plugins
- rpm-build - rpm-build
test: ./runtest.sh test: ./runtest.sh

View File

@ -3,5 +3,5 @@
set -e set -e
spec=$TMT_TREE/redhat-rpm-config.spec spec=$TMT_TREE/redhat-rpm-config.spec
dnf -y build-dep $spec dnf -y builddep $spec
rpmbuild --define "_sourcedir $TMT_TREE" -ba $spec rpmbuild --define "_sourcedir $TMT_TREE" -ba $spec