2 files changed, 10 insertions, 5 deletions
diff --git a/testsuite/systemtap.samples/syscalls.stp b/testsuite/systemtap.samples/syscalls.stp
index 68e0348a..3ccfb8e5 100644
--- a/testsuite/systemtap.samples/syscalls.stp
+++ b/testsuite/systemtap.samples/syscalls.stp
@@ -2,6 +2,6 @@
 
 global count
 probe kernel.function("sys_*").call {
-  print (sprint(pid()) . " " . pp() . "\n")
-  if (++count > 100) exit()
+	printf("%d %s\n", pid(), pp())
+	if (++count > 100) exit()
 }
diff --git a/testsuite/systemtap.samples/system_func.exp b/testsuite/systemtap.samples/system_func.exp
index d191e872..ec935783 100644
--- a/testsuite/systemtap.samples/system_func.exp
+++ b/testsuite/systemtap.samples/system_func.exp
@@ -7,9 +7,14 @@ set saw_user 0
 set user [exec whoami]
 expect {
     -timeout 30
-    -re "^$user\[^\r\]*\[\r\n\]*" {incr saw_user; exp_continue}
-    -re {^sys_open[^\r]*[\r\n]*} {incr open; exp_continue }
-    -re {DONE[^\r]*[\r\n]*} {incr done; exp_continue }
+    -re "($user|sys_open|DONE)\r" {
+	switch $expect_out(1,string) {
+	    sys_open {incr open}
+	    DONE     {incr done}
+	    default  {incr saw_user}
+	}
+	exp_continue
+    }
     timeout { fail "$test (timeout)" }
     eof { }
 }