From 863bc06741354d9932bfca35408f0dcd0013e190 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 18 May 2023 12:26:45 +0200 Subject: [PATCH] CI Tests: Regression/small-tests: Use debuginfod on Fedora --- tests/Regression/small-tests/runtest.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/Regression/small-tests/runtest.sh b/tests/Regression/small-tests/runtest.sh index 3b89566..13f898a 100755 --- a/tests/Regression/small-tests/runtest.sh +++ b/tests/Regression/small-tests/runtest.sh @@ -27,11 +27,14 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 +. /etc/os-release ||: PACKAGE="systemtap" -export DEBUGINFOD_URLS="https://debuginfod.fedoraproject.org/ $DEBUGINFOD_URLS" -export DEBUGINFOD_TIMEOUT=300 +if echo $ID | grep -Fq fedora; then + export DEBUGINFOD_URLS="https://debuginfod.fedoraproject.org/ $DEBUGINFOD_URLS" + export DEBUGINFOD_TIMEOUT=300 +fi _arch=$(arch) @@ -73,14 +76,7 @@ rlJournalStart ( perf_probe_failed "vfs_read" && exit rlPhaseStart FAIL "test 1 bz1162939" - # At this point a weird problem shows up: sometimes the first - # systemtap invocation fails for some reason, but subsequent - # invocations succeed. Can't reproduce this manually: - rlRun "stap -vvvp4 -e 'probe vfs.read{println(\"hit\")}'" 0,1 - sleep 30 - rlRun "stap -vvvp4 -e 'probe vfs.read{println(\"hit\")}'" 0,1 - sleep 30 - rlRun "stap -e 'probe vfs.read{println(\"hit\")}' -c 'head -1 /etc/hosts'" + rlRun "stap -e 'probe vfs.read{println(\"hit\"); exit()}' -c 'head -1 /etc/hosts' | grep -F hit" rlPhaseEnd ) # bz1119335 ---------------------------------------------------