PR14774: tweak test case

Splitting the test case onto separate lines helps ensure separate line
records.  Also, use [utrace_p] instead of CONFIG_UTRACE* tests for
applicability.

diff --git a/testsuite/systemtap.base/bz14774.c b/testsuite/systemtap.base/bz14774.c
index 40cc589d8448887f479c05c79ecd39a245fdcce4..ad5a0956d6241cd0a9c24305234e9430b1ed0eba 100644 (file)
--- a/testsuite/systemtap.base/bz14774.c
+++ b/testsuite/systemtap.base/bz14774.c
@@ -1,9 +1,20 @@
-int a(int i) { return i + 1; }
-int b(int i) { return i + 2; }
-int c(int i) { return i + 3; }
+int a(int i) 
+{ 
+  return i + 1; 
+}
+int b(int i) 
+{
+  return i + 2; 
+}
+int c(int i) 
+{ 
+  return i + 3; 
+}
 
 int main()
 {
-  int i = c(b(a(1)));
-  return 0;
+  int i = c(
+            b(
+              a(1)));
+  return i;
 }

diff --git a/testsuite/systemtap.base/statement.exp b/testsuite/systemtap.base/statement.exp
index 1b7d4290b76cfa7d804339240c65ade8bfdb0eda..04227004e6a36016dbae5bab1cc4563dd39fabad 100644 (file)
--- a/testsuite/systemtap.base/statement.exp
+++ b/testsuite/systemtap.base/statement.exp
@@ -74,24 +74,24 @@ set test bz14774
 catch {exec gcc -g -o $test $srcdir/$subdir/$test.c} err
 if {$err == "" && [file exists $test]} then { pass "$test compile" } else { fail "$test cmpile" }
 
-set func_script "probe %%( CONFIG_UTRACE == \"y\" %%? process(\"%s\").statement(\"*@%s.c:*\") %%: never %%) {}"
-set script [format $func_script "./$test" "$test"]
-spawn stap -p2 -we $script
-set hint 0
-set probes 0
-set skipped 0
-expect {
+if {![utrace_p]} {
+    untested "$test -p2"
+} else {
+    set func_script "probe process(\"%s\").statement(\"*@%s.c:*\") {}"
+    set script [format $func_script "./$test" "$test"]
+    spawn stap -p2 -we $script
+    set hint 0
+    set probes 0
+    set skipped 0
+    expect {
         -timeout 60
         -re "# probes" { incr hint; exp_continue }
         -re {process\("[^"]+"\)\.statement\("[^"]+"\) /\*} { incr probes; exp_continue }
-        -re {never.*} { incr skipped; exp_continue}
         timeout { fail "$test (timeout)" }
         eof { }
+    }
+    catch { wait }
+    catch { close }
+    if { $hint == 1 && $probes >= 9 } then { pass "$test -p2" } else { fail "$test -p2 ($probes)" }
 }
-wait
-if { $skipped == 1 } {
-    untested "$test -p2"
-} else {
-    if { $hint == 1 && $probes == 7 } then { pass "$test -p2" } else { fail "$test -p2 ($probes)" }
-}
-exec rm -f $test
+#exec rm -f $test