diff --git a/Sanity/basic-upstream-test-suite/runtest.sh b/Sanity/basic-upstream-test-suite/runtest.sh index 8a51329..f99569b 100755 --- a/Sanity/basic-upstream-test-suite/runtest.sh +++ b/Sanity/basic-upstream-test-suite/runtest.sh @@ -46,9 +46,12 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest - rlRun "su cupstester -c $'rpmbuild --nodeps --define \'_topdir $TmpDir\' -bc $TmpDir/SPECS/*spec'" 0 "Build the package" + # newer redhat-rpm-config brings in packager-notes script, which breaks LDFLAGS we get from Ruby + # we need to set several env variable randomly to get configure working again... + rlRun "RPM_WORKAROUND='RPM_ARCH=\"x86_64\" RPM_PACKAGE_RELEASE=\"1\" RPM_PACKAGE_VERSION=\"1\" RPM_PACKAGE_NAME=\"vim\"'" + rlRun "su cupstester -c $'${RPM_WORKAROUND} rpmbuild --nodeps --define \'_topdir $TmpDir\' -bc $TmpDir/SPECS/*spec'" 0 "Build the package" rlRun "pushd BUILD/cups*" - rlRun "su cupstester -c 'make check'" 0 "Run basic tests" + rlRun "su cupstester -c '${RPM_WORKAROUND} make check'" 0 "Run basic tests" rlPhaseEnd rlPhaseStartCleanup