Merge branch 'master' into pr6429-comp-unwindsyms

* master:
  PR6466: broad side-effect free statement elision
  Made utrace probes more robust.
  2008-04-27  William Cohen  <wcohen@redhat.com>
  2008-04-27  William Cohen  <wcohen@redhat.com>

3 files changed, 8 insertions, 6 deletions

diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp
index eaa5ca82..26d7b0ef 100644
--- a/testsuite/systemtap.base/cache.exp
+++ b/testsuite/systemtap.base/cache.exp
@@ -74,8 +74,8 @@ if [info exists env(SYSTEMTAP_DIR)] {
 set env(SYSTEMTAP_DIR) $local_systemtap_dir
 
 # Set up the scripts we'll use.
-set basic_script1 "\"probe begin { }\""
-set basic_script2 "\"probe begin, end { }\""
+set basic_script1 "\"probe begin { println(1) }\""
+set basic_script2 "\"probe begin, end { println(2) }\""
 set error_script "\"probe XbeginX { }\""
 
 # Check basic functionality.  The 1st compilation of a script won't
diff --git a/testsuite/systemtap.base/maxactive.exp b/testsuite/systemtap.base/maxactive.exp
index ca95ac53..7c03a1bf 100644
--- a/testsuite/systemtap.base/maxactive.exp
+++ b/testsuite/systemtap.base/maxactive.exp
@@ -13,8 +13,9 @@ proc sleep_five_sec {} {
 # Script1.  For 5 seconds, probe the return of "sys_select" and
 # "sys_read".  See if we skip any probes.
 set script1 {
+    global foo
     probe kernel.function("sys_select").return,
-        kernel.function("sys_read").return { }
+        kernel.function("sys_read").return { foo++ }
 
     probe timer.ms(5000) { exit(); }
     probe begin { log("systemtap starting probe"); log("systemtap ending probe");}
@@ -29,8 +30,9 @@ set skipped1 $skipped_probes
 # "sys_read", with a limit of 1 probe active at a time.  See if we
 # skip any probes.
 set script2 {
+    global foo
     probe kernel.function("sys_select").return.maxactive(1),
-        kernel.function("sys_read").return.maxactive(1) { }
+        kernel.function("sys_read").return.maxactive(1) { foo++ }
 
     probe timer.ms(5000) { exit(); }
     probe begin { log("systemtap starting probe"); log("systemtap ending probe");}
diff --git a/testsuite/systemtap.base/warnings.exp b/testsuite/systemtap.base/warnings.exp
index 90409d18..025bde89 100644
--- a/testsuite/systemtap.base/warnings.exp
+++ b/testsuite/systemtap.base/warnings.exp
@@ -9,8 +9,8 @@ expect {
     eof { }
 }
 wait
-if {$ok == 6} {
+if {$ok == 9} {
     pass $test
 } else {
-    fail $test
+    fail "$test ($ok)"
 }