diff options
| -rwxr-xr-x | testsuite/semok/utrace01.stp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.base/bz10294.stp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.base/bz6905.stp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.base/statement.exp | 21 |
4 files changed, 20 insertions, 7 deletions
diff --git a/testsuite/semok/utrace01.stp b/testsuite/semok/utrace01.stp index 864bdf15..85711fb5 100755 --- a/testsuite/semok/utrace01.stp +++ b/testsuite/semok/utrace01.stp @@ -1,4 +1,4 @@ #! stap -p2 # process path doesn't need to be absolute -probe process("cat").end { } +probe %( CONFIG_UTRACE == "y" %? process("cat").end %: never %) { } diff --git a/testsuite/systemtap.base/bz10294.stp b/testsuite/systemtap.base/bz10294.stp index 0a18c45f..383c5165 100644 --- a/testsuite/systemtap.base/bz10294.stp +++ b/testsuite/systemtap.base/bz10294.stp @@ -1,4 +1,4 @@ #! stap -p2 -probe process("./bz10294").statement("*@bz10294.c:10-10") { +probe %( CONFIG_UTRACE == "y" %? process("./bz10294").statement("*@bz10294.c:10-10") %: never %) { printf("ok") } diff --git a/testsuite/systemtap.base/bz6905.stp b/testsuite/systemtap.base/bz6905.stp index 73c7d50c..df73d94a 100644 --- a/testsuite/systemtap.base/bz6905.stp +++ b/testsuite/systemtap.base/bz6905.stp @@ -1,4 +1,4 @@ #! stap -p2 -probe process("./bz6905").statement("main@bz6905.c:*") { +probe %( CONFIG_UTRACE == "y" %? process("./bz6905").statement("main@bz6905.c:*") %: never %) { printf("ok") } diff --git a/testsuite/systemtap.base/statement.exp b/testsuite/systemtap.base/statement.exp index 8d4c59f5..2ad696c8 100644 --- a/testsuite/systemtap.base/statement.exp +++ b/testsuite/systemtap.base/statement.exp @@ -6,15 +6,21 @@ if {$err == "" && [file exists $test]} then { pass "$test compile" } else { fail spawn stap -p2 $srcdir/$subdir/$test.stp 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 { } } wait -if { $hint == 1 && $probes > 0 } then { pass "$test -p2" } else { fail "$test -p2 ($probes)" } +if { $skipped == 1 } { + untested "$test -p2" +} else { + if { $hint == 1 && $probes > 0 } then { pass "$test -p2" } else { fail "$test -p2 ($probes)" } +} exec rm -f $test set test bz10294 @@ -25,23 +31,30 @@ if {$err == "" && [file exists $test]} then { pass "$test compile" } else { fail spawn stap -p2 $srcdir/$subdir/$test.stp 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 { } } wait -if { $hint == 1 && $probes == 1 } then { pass "$test -p2" } else { fail "$test -p2 ($probes)" } +if { $skipped == 1 } { + untested "$test -p2" +} else { + if { $hint == 1 && $probes == 1 } then { pass "$test -p2" } else { fail "$test -p2 ($probes)" } +} set no_func stmtnofunc -set func_script "probe process(\"%s\").statement(\"foo@%s.c:*\"){}" +set func_script "probe %%( CONFIG_UTRACE == \"y\" %%? process(\"%s\").statement(\"foo@%s.c:*\") %%: never %%) {}" set script [format $func_script "./$test" "$test"] -spawn stap -p2 -e $script +spawn stap -p2 -we $script expect { -timeout 60 -re {semantic error: no match while resolving probe point.*\r\n} { xfail $no_func } + -re {never.*} { untested "$no_func"} timeout { fail "$no_func (timeout)" } eof { fail $no_func } } |