From: hunt <hunt>
Date: Mon, 7 May 2007 17:11:49 +0000 (+0000)
Subject: 2007-05-07  Martin Hunt  <hunt@redhat.com>
X-Git-Tag: release-0.5.14~102
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=e41dec42de3cf3881c0c5ba79a4938c9158b041f;p=systemtap.git

2007-05-07  Martin Hunt  <hunt@redhat.com>
	PR4466
	* systemtap.samples/system_func.stp: Rewrite test to account
	for probes not being placed until after begin.
	* systemtap.samples/system_func.exp: Only expect 1 sys_open.
---

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 79a6cdd5e..34b9dfdf5 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-07  Martin Hunt  <hunt@redhat.com>
+	PR4466   
+	* systemtap.samples/system_func.stp: Rewrite test to account 
+	for probes not being placed until after begin.
+	* systemtap.samples/system_func.exp: Only expect 1 sys_open.
+
 2007-05-06  Frank Ch. Eigler  <fche@elastic.org>
 
 	* semko/thirtynine.stp: New test.
diff --git a/testsuite/systemtap.samples/system_func.exp b/testsuite/systemtap.samples/system_func.exp
index 1fef1717a..0128b181b 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 60d9a7239..0b074514a 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 {