From 9cb960d9be603dc53e686361cf72a421b0dfb37f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 11 Aug 2023 13:32:10 +0200 Subject: [PATCH] Remove *SPECPARTS dir in tests which use rpmbuild RPM on F39+ creates dir -SPECPARTS in BUILD during %%setup, which breaks tests which use `cd BUILD/*`. The new dir is needed only for components which dynamically generate spec files during %%build or %%install phases, which this component is not. --- Sanity/upstream-scripttests/runtest.sh | 1 + Sanity/upstream-unittests/runtest.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/Sanity/upstream-scripttests/runtest.sh b/Sanity/upstream-scripttests/runtest.sh index 48a8099..8564527 100755 --- a/Sanity/upstream-scripttests/runtest.sh +++ b/Sanity/upstream-scripttests/runtest.sh @@ -85,6 +85,7 @@ rlJournalStart rlRun "mkdir BUILD" 0 "Creating BUILD directory" rlRun "rpmbuild --nodeps --define '_topdir $TmpDir' -bp $TmpDir/SPECS/*spec" \ 0 "Preparing sources" + rm -rf BUILD/*SPECPARTS rlRun "cd BUILD/vim*" rlRun "chown -R $TESTER.$TESTER $TmpDir" 0 "Setting permissions" rlRun "export LANG=en_US.UTF-8" 0 "Setting \$LANG to US locale" diff --git a/Sanity/upstream-unittests/runtest.sh b/Sanity/upstream-unittests/runtest.sh index 6f22812..d2d9794 100755 --- a/Sanity/upstream-unittests/runtest.sh +++ b/Sanity/upstream-unittests/runtest.sh @@ -61,6 +61,7 @@ rlJournalStart rlRun "mkdir BUILD" 0 "Creating BUILD directory" rlRun "rpmbuild --nodeps --define '_topdir $TmpDir' -bp $TmpDir/SPECS/*spec" \ 0 "Preparing sources" + rm -rf BUILD/*SPECPARTS rlRun "cd BUILD/vim*" rlRun "chown -R $TESTER.$TESTER $TmpDir" 0 "Setting permissions" rlRun "export LANG=en_US.UTF-8" 0 "Setting \$LANG to US locale"