diff --git a/tests/main.fmf b/tests/main.fmf index e3ae892..9305474 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -120,7 +120,8 @@ adjust+: require+: - binutils - binutils-devel - - binutils-gold + # No binutils-gold for RHEL-8 system binutils + # - binutils-gold - gcc - gcc-c++ - annobin @@ -299,6 +300,7 @@ adjust+: - binutils - binutils-devel - binutils-gold + - binutils-gprofng - gcc - gcc-c++ - annobin-plugin-gcc @@ -314,6 +316,7 @@ adjust+: - binutils - binutils-devel - binutils-gold + - binutils-gprofng - gcc - gcc-c++ - annobin-plugin-gcc @@ -329,6 +332,7 @@ adjust+: - binutils - binutils-devel - binutils-gold + - binutils-gprofng - gcc - gcc-c++ - annobin-plugin-gcc diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf index 4a6eb05..9545398 100644 --- a/tests/testsuite/main.fmf +++ b/tests/testsuite/main.fmf @@ -65,3 +65,9 @@ adjust+: test: "$WITH_SCL ./test-with-cross.sh" environment+: MAY_BUILD_OTHER_ARCHES: "no" + + - because: "On Fedora 38 and newer, system binutils build extra binaries for cross compilation" + when: distro == fedora-38 + test: "$WITH_SCL ./test-with-cross.sh" + environment+: + MAY_BUILD_OTHER_ARCHES: "no" diff --git a/tests/testsuite/test-with-cross.sh b/tests/testsuite/test-with-cross.sh index 1e3437e..1c56495 100755 --- a/tests/testsuite/test-with-cross.sh +++ b/tests/testsuite/test-with-cross.sh @@ -97,9 +97,9 @@ rlJournalStart rlRun "awk \"/=== $TOOL tests ===/,/=== $TOOL Summary ===/\" $tool_log.sum > $tool_log.tests" 0,1 "Save results of all tests" rlRun "grep -E '^FAIL: ' $tool_log.tests | sort > $tool_log.failed" 0,1 "Save failures" - rlRun "grep '# of unexpected failures' $tool_log.sum" 0,1 "Checking number of unexpected failures" - rlLogInfo "$(sort < "$tool_log.failed")" - rlLogInfo "$(grep -E '^[A-Z]+:' "$tool_log.tests" | sort)" + rlRun "grep '# of unexpected failures' $tool_log.sum" 1 "Checking number of unexpected failures" + rlLogInfo "Failed tests:\n$(sort < "$tool_log.failed")" + rlLogInfo "All tests:\n$(grep -E '^[A-Z]+:' "$tool_log.tests" | sort)" rlPhaseEnd done done diff --git a/tests/testsuite/test.sh b/tests/testsuite/test.sh index 9e559d0..383862b 100755 --- a/tests/testsuite/test.sh +++ b/tests/testsuite/test.sh @@ -71,9 +71,9 @@ rlJournalStart rlRun "awk \"/=== $TOOL tests ===/,/=== $TOOL Summary ===/\" $tool_log.sum > $tool_log.tests" 0,1 "Save results of all tests" rlRun "grep -E '^FAIL: ' $tool_log.tests | sort > $tool_log.failed" 0,1 "Save failures" - rlRun "grep '# of unexpected failures' $tool_log.sum" 0,1 "Checking number of unexpected failures" - rlLogInfo "$(sort < "$tool_log.failed")" - rlLogInfo "$(grep -E '^[A-Z]+:' "$tool_log.tests" | sort)" + rlRun "grep '# of unexpected failures' $tool_log.sum" 1 "Checking number of unexpected failures" + rlLogInfo "Failed tests:\n$(sort < "$tool_log.failed")" + rlLogInfo "All tests:\n$(grep -E '^[A-Z]+:' "$tool_log.tests" | sort)" rlPhaseEnd done