diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-08-24 17:09:29 +0200 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-08-24 17:13:17 +0200 |
| commit | 345bbb3d0f827566083cb124c6f3641639ad98d4 (patch) | |
| tree | 71883cf1024a731c8a960b2e38970ff446c3a493 /testsuite | |
| parent | 1392896dcda33324d43392f8e99fed240cf5fb9b (diff) | |
| download | systemtap-steved-345bbb3d0f827566083cb124c6f3641639ad98d4.tar.gz systemtap-steved-345bbb3d0f827566083cb124c6f3641639ad98d4.tar.xz systemtap-steved-345bbb3d0f827566083cb124c6f3641639ad98d4.zip | |
Fix failing uprobes.exp -p5 failures by removing trailing spaces in $$ vars.
* tapsets.cxx (dwarf_var_expanding_visitor::visit_target_symbol_context):
Don't add extra space at end of list, only add space between symbols.
* testsuite/systemtap.base/uprobes.exp: Use more specific expect regex.
* testsuite/systemtap.base/vars.exp: Don't just chop off last char of printf
output string.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/systemtap.base/uprobes.exp | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.base/vars.exp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp index bdd620b3..3b98c8b1 100644 --- a/testsuite/systemtap.base/uprobes.exp +++ b/testsuite/systemtap.base/uprobes.exp @@ -36,8 +36,8 @@ if {! [installtest_p]} { spawn stap $srcdir/$subdir/uprobes.stp -w -c "./jennie 1 2 3 4" set ok 0 expect { - -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*argc=0x[1-5][^\r\n]*\r\n} { incr ok; exp_continue } - -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return=0x0[^\r\n]*\r\n} { incr ok; exp_continue } + -re {^process[^\r\n]+jennie[^\r\n]+main[^\r\n]+arg[cv]=0x[0-9a-f]+\ +arg[cv]=0x[0-9a-f]+\r\n} { incr ok; exp_continue } + -re {^process[^\r\n]+jennie[^\r\n]+main[^\r\n]+return=0x0\r\n} { incr ok; exp_continue } -timeout 30 timeout { } eof { } diff --git a/testsuite/systemtap.base/vars.exp b/testsuite/systemtap.base/vars.exp index 195abee0..75afe9ef 100644 --- a/testsuite/systemtap.base/vars.exp +++ b/testsuite/systemtap.base/vars.exp @@ -3,7 +3,7 @@ set test "vars" # grab C statement that $$vars yields -set cmd [concat stap -p3 -e {"probe kernel.statement(\"bio_copy_user@fs/bio.c+1\") \{print (\$\$vars)\}"} | grep {"printf.*="} | sed -e {"s/^.*MAXSTRINGLEN, \"//"} -e {s/.\".*$//}] +set cmd [concat stap -p3 -e {"probe kernel.statement(\"bio_copy_user@fs/bio.c+1\") \{print (\$\$vars)\}"} | grep {"printf.*="} | sed -e {"s/^.*MAXSTRINGLEN, \"//"} -e {s/\".*$//}] catch {eval exec $cmd} vars # grab C statement that $$parms yields |