From 19d1385d28bbede8204b3e98fc1670976d6f7ac4 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Fri, 14 Sep 2018 21:15:38 -0400
Subject: [PATCH] CI take 5, k.i.s.s.

---
 tests/dejagnu-smoketest/Makefile      |  4 ++--
 tests/dejagnu-smoketest/runtest.sh    | 10 ++++++++--
 tests/dejagnu-smoketest/test-smoke.sh | 14 --------------
 3 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100755 tests/dejagnu-smoketest/test-smoke.sh

diff --git a/tests/dejagnu-smoketest/Makefile b/tests/dejagnu-smoketest/Makefile
index 837c343..e212345 100644
--- a/tests/dejagnu-smoketest/Makefile
+++ b/tests/dejagnu-smoketest/Makefile
@@ -6,13 +6,13 @@ export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
 
 .PHONY: all install download clean
 BUILT_FILES= 
-FILES=$(METADATA) runtest.sh Makefile PURPOSE test-smoke.sh
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
 
 run: $(FILES) build
 	./runtest.sh
 
 build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh ./test-smoke.sh
+	chmod a+x ./runtest.sh
 
 clean:
 	rm -f *~ *.rpm $(BUILT_FILES)
diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh
index 94edebe..546a583 100755
--- a/tests/dejagnu-smoketest/runtest.sh
+++ b/tests/dejagnu-smoketest/runtest.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 
 set -e
-dnf debuginfo-install -y kernel libstdc++-devel
+set -x
 
-rhts-run-simple-test $TEST ./test-smoke.sh
+dnf debuginfo-install -y kernel
+
+stap -L 'process("stap").mark("*")' | grep -q pass
+stap -L 'kernel.trace("*")' | grep -q sys_
+stap -v --example helloworld.stp
+stap -v -T 1 -e 'probe kernel.function("do_exit") {println($$vars)}'
+stap -v -T 1 -e 'probe syscall.* ? {println(argstr)}'
diff --git a/tests/dejagnu-smoketest/test-smoke.sh b/tests/dejagnu-smoketest/test-smoke.sh
deleted file mode 100755
index 4108b37..0000000
--- a/tests/dejagnu-smoketest/test-smoke.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-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
-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
-    log "RESULT: PASS"
-fi