rpms/binutils
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the Sanity/testsuite test for new build location

Browse Source 
6bfd06790b changed where the build
actually happens, so these cp commands fail and break the test.
This change is based on the version in
https://gitlab.com/redhat/centos-stream/rpms/binutils/-/blob/c9s/tests/Sanity/testsuite/runtest.sh
but reimplemented in line with the rest of this somewhat
different version of the test (I am not sure what the story is
with these different versions of the tests in Fedora vs. CentOS
Stream, I'm trying to find that out).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-08-17 17:46:55 -07:00
parent ccf531f53d
commit 53e1e785a0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/Sanity/testsuite/runtest.sh
View File

@ -89,13 +89,14 @@ rlJournalStart
export BUILDDIR=`rpm --eval=%_builddir` export BUILDDIR=`rpm --eval=%_builddir`
export CURRENT_BUILD=${BUILDDIR}/binutils-`rpmquery $PACKAGE --queryformat=%{VERSION}` export CURRENT_BUILD=${BUILDDIR}/binutils-`rpmquery $PACKAGE --queryformat=%{VERSION}`
rlRun "rpmbuild -bc $SPECDIR/binutils.spec" rlRun "rpmbuild -bc $SPECDIR/binutils.spec"
rlRun "ARCH=$(arch)"
rlRun "cp $CURRENT_BUILD/binutils/binutils.log $CURRENT_BUILD/binutils/binutils.sum $LOGDIR/" rlRun "cp $CURRENT_BUILD/build-$ARCH-redhat-linux/binutils/binutils.log $CURRENT_BUILD/build-$ARCH-redhat-linux/binutils/binutils.sum $LOGDIR/"
rlRun "cp $CURRENT_BUILD/ld/ld.log $CURRENT_BUILD/ld/ld.sum $LOGDIR/" rlRun "cp $CURRENT_BUILD/build-$ARCH-redhat-linux/ld/ld.log $CURRENT_BUILD/build-$ARCH-redhat-linux/ld/ld.sum $LOGDIR/"
rlRun "cp $CURRENT_BUILD/gas/testsuite/gas.log $CURRENT_BUILD/gas/testsuite/gas.sum $LOGDIR/" rlRun "cp $CURRENT_BUILD/build-$ARCH-redhat-linux/gas/testsuite/gas.log $CURRENT_BUILD/build-$ARCH-redhat-linux/gas/testsuite/gas.sum $LOGDIR/"
rlPhaseEnd rlPhaseEnd
if [ "$(arch)" = "x86_64" ]; then if [ "$ARCH" = "x86_64" ]; then
rlPhaseStartTest Regression-bz1614908 rlPhaseStartTest Regression-bz1614908
rlLogInfo "Checking if bz#1614908 is reproducible" rlLogInfo "Checking if bz#1614908 is reproducible"
rlRun "gold_test_binary=$(find $CURRENT_BUILD -iname gnu_property_test -type f -executable)" 0 "Looking for binary from gold testsuite" rlRun "gold_test_binary=$(find $CURRENT_BUILD -iname gnu_property_test -type f -executable)" 0 "Looking for binary from gold testsuite"
@ -120,7 +121,7 @@ rlJournalStart
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
expected_fails_file="" # here we define expected failures if needed expected_fails_file="" # here we define expected failures if needed
if [ "$expected_fails_file" = "" ]; then if [ "$expected_fails_file" = "" ]; then
rlFail "No list of expected failures exists for this environment: release=$(cat /etc/redhat-release), arch=$(arch), tool=$TOOL" rlFail "No list of expected failures exists for this environment: release=$(cat /etc/redhat-release), arch=$ARCH, tool=$TOOL"
rlFail "Unexpected failures found" rlFail "Unexpected failures found"
else else
rlRun "diff $expected_fails_file $LOGDIR/$TOOL.failed" 0,1 rlRun "diff $expected_fails_file $LOGDIR/$TOOL.failed" 0,1