From c730acbcfd77a6a71d49aa5ab8cfb4154d723143 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 14 Sep 2018 19:38:15 -0400 Subject: [PATCH] CI try 4 --- tests/dejagnu-smoketest/runtest.sh | 2 +- tests/dejagnu-smoketest/test-smoke.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh index 7f4bc2d..94edebe 100755 --- a/tests/dejagnu-smoketest/runtest.sh +++ b/tests/dejagnu-smoketest/runtest.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -dnf debuginfo-install -y kernel +dnf debuginfo-install -y kernel libstdc++-devel rhts-run-simple-test $TEST ./test-smoke.sh diff --git a/tests/dejagnu-smoketest/test-smoke.sh b/tests/dejagnu-smoketest/test-smoke.sh index 4dcdc6d..4108b37 100755 --- a/tests/dejagnu-smoketest/test-smoke.sh +++ b/tests/dejagnu-smoketest/test-smoke.sh @@ -1,12 +1,14 @@ #! /bin/sh -set -e -set -x cd /usr/share/systemtap/testsuite +rm -f systemtap.sum.results make installcheck RUNTESTFLAGS=proc_by_pid.exp cat systemtap.sum | sed -ne '/systemtap.Summary/,$ p' | tee systemtap.sum.results -if grep -q unexpected systemtap.sum.results ; then - exit 0 +log "Results: `cat systemtap.sum.results`" +if [ ! -f systemtap.sum.results ]; then + log "RESULT: FAIL" +elif grep -q unexpected systemtap.sum.results ; then + log "RESULT: FAIL" else - exit 1 + log "RESULT: PASS" fi