From a9f3f30da41389c0fddbf5a722bee1985424e0b9 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 13 May 2021 13:01:56 +0200 Subject: [PATCH] Log package versions in CI tests --- tests/Regression/identify/runtest.sh | 1 + tests/Regression/lto-preprocessor-options/runtest.sh | 2 +- tests/Regression/testsuite/runtest.sh | 2 ++ tests/Sanity/gcc-fedora-flags/runtest.sh | 2 ++ tests/Sanity/smoke/runtest.sh | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Regression/identify/runtest.sh b/tests/Regression/identify/runtest.sh index d1b3b5f..7907036 100755 --- a/tests/Regression/identify/runtest.sh +++ b/tests/Regression/identify/runtest.sh @@ -32,6 +32,7 @@ PACKAGE="annobin" rlJournalStart rlPhaseStartTest + rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort" rlRun "tool_v=$(annocheck --version | awk '/^annocheck: Version/ {print $3}')" rlRun "__RPM=$(rpm --queryformat='%{name}\n' -qf $(man -w annobin))" rlRun "rpm_v=$(rpm -q --queryformat='%{version}\n' $__RPM)" diff --git a/tests/Regression/lto-preprocessor-options/runtest.sh b/tests/Regression/lto-preprocessor-options/runtest.sh index 7c54481..430d830 100755 --- a/tests/Regression/lto-preprocessor-options/runtest.sh +++ b/tests/Regression/lto-preprocessor-options/runtest.sh @@ -33,7 +33,7 @@ PACKAGE="annobin" rlJournalStart rlPhaseStartTest b=`mktemp` - rlRun "rpm -q redhat-rpm-config" + rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort" rlRun "cflags=\"$(rpm --eval '%build_cflags')\"" rlRun "ldflags=\"$(rpm --eval '%build_ldflags')\"" rlRun "echo 'int main (void) { return 0; }' | gcc -xc -o $b $cflags $ldflags -flto - " diff --git a/tests/Regression/testsuite/runtest.sh b/tests/Regression/testsuite/runtest.sh index 4a92cd9..c8016ad 100755 --- a/tests/Regression/testsuite/runtest.sh +++ b/tests/Regression/testsuite/runtest.sh @@ -42,6 +42,8 @@ rlJournalStart rlLogInfo "X_SCLS=$X_SCLS" rlLogInfo "GCC=$GCC" + rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort" + # In case more than one devtoolset- or gcc-toolset -build package is # installed (they can co-exist from the packaging persp, but their # coexistence causes unexpected results with rpm macros), then we have diff --git a/tests/Sanity/gcc-fedora-flags/runtest.sh b/tests/Sanity/gcc-fedora-flags/runtest.sh index 13da313..8ef829f 100755 --- a/tests/Sanity/gcc-fedora-flags/runtest.sh +++ b/tests/Sanity/gcc-fedora-flags/runtest.sh @@ -16,6 +16,8 @@ set +x rlJournalStart rlPhaseStartTest + rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort" + rlRun "test \"$default_cflags\" = \"$cflags\"" rlRun "test \"$default_cxxflags\" = \"$cxxflags\"" rlRun "test \"$default_ldflags\" = \"$ldflags\"" diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh index 0f39938..566e571 100755 --- a/tests/Sanity/smoke/runtest.sh +++ b/tests/Sanity/smoke/runtest.sh @@ -38,6 +38,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest + rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort" rlRun "echo 'int main() {return 0;}' | gcc -xc -fplugin=annobin -o /dev/null -" rlPhaseEnd rlJournalPrintText