Fix at_deref and at_var_cu test driver issues

Add wait to at_deref.exp to avoid timing issue.  Check at_var_cu (bah, baz) to counter value in prologue.

diff --git a/testsuite/systemtap.base/at_deref.exp b/testsuite/systemtap.base/at_deref.exp
index 03b44d993e87a842022ab2c7c6f4eea294b20a2f..eae202e6a1d6fa562d3492e3786d8180906e6a2f 100644 (file)
--- a/testsuite/systemtap.base/at_deref.exp
+++ b/testsuite/systemtap.base/at_deref.exp
@@ -9,7 +9,7 @@ if { $res != "" } {
     verbose "target_compile failed: $res" 2
     fail "${test}: unable to compile ${test}.c"
 } else {
-    stap_run  $subtest2 no_load $all_pass_string $srcdir/$subdir/at_deref2.stp -c ./${test} -w
+    stap_run  $subtest2 wait_5_secs $all_pass_string $srcdir/$subdir/at_deref2.stp -c ./${test} -w
 }
 
 # Cleanup

diff --git a/testsuite/systemtap.base/at_var_cu.exp b/testsuite/systemtap.base/at_var_cu.exp
index 6546824a5e4e95872db7d4ea2cf7a0967c03e806..758d4e599fe0cd5a06b53830b70ef6ce400ade24 100644 (file)
--- a/testsuite/systemtap.base/at_var_cu.exp
+++ b/testsuite/systemtap.base/at_var_cu.exp
@@ -15,11 +15,11 @@ bar: @var("counter", @1): 7
 bar: @var("counter@at_var_cu_2.c", @1): 7
 bar: @var("counter@at_var_cu_3.c", @1): 0
 bar: @var("counter@at_var_cu*.c", @1): 7
-baz: @var("counter", @1): 8
+baz: @var("counter", @1): 0
 baz: @var("counter@at_var_cu_2.c", @1): 8
 baz: @var("counter@at_var_cu_3.c", @1): 0
 baz: @var("counter@at_var_cu*.c", @1): 8
-bah: @var("counter", @1): 8
+bah: @var("counter", @1): 3
 bah: @var("counter@at_var_cu_2.c", @1): 8
 bah: @var("counter@at_var_cu_3.c", @1): 3
 bah: @var("counter@at_var_cu*.c", @1): 8