testsuite wakeup.*: standardize more

Eliminating the timer.s() wait, putting in a fixed 'sleep NN'
into the -c CMD string makes stopping condition clearer and
overall CMD exit value fixed (0).

diff --git a/testsuite/systemtap.base/wakeup.exp b/testsuite/systemtap.base/wakeup.exp
index 5be83fad7aae24ad719e2cd19798a3825db0d80d..13bc06eca3e9611fce48d7182b806b68814b9f2f 100644 (file)
--- a/testsuite/systemtap.base/wakeup.exp
+++ b/testsuite/systemtap.base/wakeup.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} {untested $test; return}
 
 # There have been issues with kernel probes put into the wake_up path.
 # see http://sourceware.org/ml/systemtap/2011-q3/msg00163.html
-spawn stap -DMAXERRORS=999 $srcdir/$subdir/$test.stp -c {ls -laR /dev/* /proc/* > /dev/null 2>&1}
+spawn stap -DMAXERRORS=999 $srcdir/$subdir/$test.stp -c {ls -laR /dev/* /proc/* > /dev/null 2>&1; sleep 5}
 set systems 0
 set warns 0
 set errors 0
@@ -20,5 +20,5 @@ expect {
 }
 wait
 
-# WARNINGs get collapsed, so only 1 expected ... plus the three from staprun re. the ERROR exits.
-if {$systems == 8 && $warns == 4 && $errors == 8 && $prints == 1} { pass "$test" } { fail "$test ($systems,$warns,$errors,$prints)" }
+# WARNINGs get collapsed, so only 1 expected ... plus the two from staprun re. the ERROR exits.
+if {$systems == 8 && $warns == 3 && $errors == 8 && $prints == 1} { pass "$test" } { fail "$test ($systems,$warns,$errors,$prints)" }

diff --git a/testsuite/systemtap.base/wakeup.stp b/testsuite/systemtap.base/wakeup.stp
index 66fbca9e6de493eaed1841d9eaa0782e11c46ea5..8525db1aa7ddd1b012cf2fa9db51ca1809e4a029 100644 (file)
--- a/testsuite/systemtap.base/wakeup.stp
+++ b/testsuite/systemtap.base/wakeup.stp
@@ -15,7 +15,3 @@ probe kernel.function("__wake_up_common") if (testing)
       testing = 0
     }
 }
-
-probe timer.s(10) { /* hoping that all the above activity is all done now */
-    exit()
-}