diff options
| author | ddomingo <ddomingo@redhat.com> | 2008-10-13 14:38:03 +1000 |
|---|---|---|
| committer | ddomingo <ddomingo@redhat.com> | 2008-10-13 14:38:03 +1000 |
| commit | f4e4014f97627cfd36429d1c5b8e65373a837875 (patch) | |
| tree | a36ae1581270ca034e211e67a8ad45e4aa6a25d7 /testsuite/systemtap.base | |
| parent | 74939defa679347fdd0b32d804b24b9976cb7cf3 (diff) | |
| parent | 180b066c1d27320c1d706e35f56c8dc165d89583 (diff) | |
| download | systemtap-steved-f4e4014f97627cfd36429d1c5b8e65373a837875.tar.gz systemtap-steved-f4e4014f97627cfd36429d1c5b8e65373a837875.tar.xz systemtap-steved-f4e4014f97627cfd36429d1c5b8e65373a837875.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'testsuite/systemtap.base')
| -rw-r--r-- | testsuite/systemtap.base/badkprobe.exp | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | testsuite/systemtap.base/bz6850.stp | 0 | ||||
| -rw-r--r-- | testsuite/systemtap.base/uprobes.exp | 6 | ||||
| -rw-r--r-- | testsuite/systemtap.base/warnings.exp | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/testsuite/systemtap.base/badkprobe.exp b/testsuite/systemtap.base/badkprobe.exp new file mode 100644 index 00000000..9e4de901 --- /dev/null +++ b/testsuite/systemtap.base/badkprobe.exp @@ -0,0 +1,11 @@ +set script "probe kernel.statement(-1).absolute {} probe timer.s(1) { exit() }" + +set test "bad kprobe registration" +spawn stap -g -w -e "$script" +expect { + -re "^WARNING: probe .*registration error.*" { pass $test } + eof { fail "$test (eof)" } + timeout { fail "$test (timeout)" } +} +catch {close} +catch {wait} diff --git a/testsuite/systemtap.base/bz6850.stp b/testsuite/systemtap.base/bz6850.stp index d6f41862..d6f41862 100644..100755 --- a/testsuite/systemtap.base/bz6850.stp +++ b/testsuite/systemtap.base/bz6850.stp diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp index 391f5028..02a0fd33 100644 --- a/testsuite/systemtap.base/uprobes.exp +++ b/testsuite/systemtap.base/uprobes.exp @@ -16,12 +16,12 @@ close $fp if [file exists $path] then { pass "$test prep" } else { fail "$test prep" } catch {exec gcc -g -o jennie jennie.c} err -if {$err == "" && [file exists jennie]} then { pass "$test compile" } else { pass "$test compile" } +if {$err == "" && [file exists jennie]} then { pass "$test compile" } else { fail "$test compile" } set rc [stap_run_batch $srcdir/$subdir/uprobes.stp] if {$rc == 0} then { pass "$test -p4" } else { fail "$test -p4" } -if {! [installtest_p]} { untested "$test -p5"; return } +if {! [installtest_p]} { untested "$test -p5"; exec rm -f jennie.c jennie; return } spawn sudo stap -v $srcdir/$subdir/uprobes.stp -c "./jennie 1 2 3 4" set ok 0 @@ -39,3 +39,5 @@ expect { } if {$ok == 10} then { pass "$test -p5" } else { fail "$test -p5 ($ok)" } catch {wait; close} + +exec rm -f jennie.c jennie diff --git a/testsuite/systemtap.base/warnings.exp b/testsuite/systemtap.base/warnings.exp index a90860d9..4bbef40d 100644 --- a/testsuite/systemtap.base/warnings.exp +++ b/testsuite/systemtap.base/warnings.exp @@ -6,6 +6,8 @@ expect { -timeout 30 -re {^WARNING:[^\r\n]*\r\n} { incr ok; exp_continue } -re {^[^\r\n]*.ko\r\n} { incr ok; exp_continue } + -re {^[^\r]*source:[^\r\n]*\r\n} {exp_continue} + -re {^[^\r\n]*\^[^\r\n]*\r\n} {exp_continue} timeout { fail "$test (timeout)" } eof { } } |