2 files changed, 16 insertions, 10 deletions
diff --git a/testsuite/systemtap.samples/system_func.exp b/testsuite/systemtap.samples/system_func.exp
index 1fef1717..0128b181 100644
--- a/testsuite/systemtap.samples/system_func.exp
+++ b/testsuite/systemtap.samples/system_func.exp
@@ -14,5 +14,4 @@ expect {
     eof { }
 }
 catch {close}; wait
-#puts "open=$open saw_user=$saw_user, done=$done"
-if {$open > 0 && $saw_user == 1 && $done == 1 } { pass "$test" } { fail "$test ($open,$saw_user,$done)" }
+if {$open == 1 && $saw_user == 1 && $done == 1 } { pass "$test" } { fail "$test ($open,$saw_user,$done)" }
diff --git a/testsuite/systemtap.samples/system_func.stp b/testsuite/systemtap.samples/system_func.stp
index 60d9a723..0b074514 100644
--- a/testsuite/systemtap.samples/system_func.stp
+++ b/testsuite/systemtap.samples/system_func.stp
@@ -2,20 +2,27 @@
 
 # test the system() function
 
+global saw_echo
+
 probe kernel.function("sys_open") {
-  # very inefficient. Testing only. DO NOT DO THIS
-  msg="echo sys_open"
-  system(msg)
+  if (!saw_echo) {
+    # very inefficient. Testing only. DO NOT DO THIS
+    msg="echo sys_open"
+    system(msg)
+    saw_echo = 1
+  }
+}
+
+probe timer.ms(100) {
+  # should fail	
+  system("cat __xyzzy123ABC__")
 }
 
+probe timer.ms(110) { exit() }
+
 probe begin {
   # should succeed
   system("whoami")
-
-  # should fail
-  system("cat __xyzzy123ABC__")
-
-  exit()
 }
 
 probe end {