diff options
| author | jistone <jistone> | 2006-12-08 02:17:09 +0000 |
|---|---|---|
| committer | jistone <jistone> | 2006-12-08 02:17:09 +0000 |
| commit | 16e8f21f336bcfc16a1174be8a8143668dbd0118 (patch) | |
| tree | c967ecdec501b69910a16ee0f50317434ed49675 /testsuite/systemtap.samples | |
| parent | e0d86324628566cedd055ed038fd487c12db676a (diff) | |
| download | systemtap-steved-16e8f21f336bcfc16a1174be8a8143668dbd0118.tar.gz systemtap-steved-16e8f21f336bcfc16a1174be8a8143668dbd0118.tar.xz systemtap-steved-16e8f21f336bcfc16a1174be8a8143668dbd0118.zip | |
2006-12-07 Josh Stone <joshua.i.stone@intel.com>
PR 3624.
* tapsets.cxx (struct be_derived_probe): Add a new priority parameter
for begin/end probes, and a comparison function for sorting.
(be_builder::build): Parse the priority & pass it to be_derived_probe.
(be_derived_probe_group::emit_module_init, emit_module_exit): Sort the
probe list by priority before emitting any code.
(register_standard_tapsets): Add new begin/end variants.
* parse.cxx (parser::parse_literal): Allow negative numeric literals,
by checking for a '-' unary operator right before a number.
testsuite/
* systemtap.base/be_order.exp, systemtap.base/be_order.stp,
semok/beginend.stp: New tests for begin/end priorities.
* lib/stap_run.exp: Anchor OUTPUT_CHECK_STRING to the end of output.
* systemtap.base/maxactive.exp: Fix to compare output to the end.
* systemtap.base/probefunc.exp: Ditto.
* systemtap.samples/ioblocktest.exp: Ditto.
* systemtap.samples/ioblocktest.stp: Ditto.
* systemtap.samples/tcptest.exp: Ditto.
Diffstat (limited to 'testsuite/systemtap.samples')
| -rw-r--r-- | testsuite/systemtap.samples/ioblocktest.exp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.samples/ioblocktest.stp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.samples/tcptest.exp | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/systemtap.samples/ioblocktest.exp b/testsuite/systemtap.samples/ioblocktest.exp index 43c44f5e..e80ec757 100644 --- a/testsuite/systemtap.samples/ioblocktest.exp +++ b/testsuite/systemtap.samples/ioblocktest.exp @@ -8,5 +8,5 @@ proc sleep_ten_secs {} { return 0; } -set output_string "\\mioblock*" +set output_string "ioblock: \\S+\t\\d+\t\[RW]\t\[01]\r\n" stap_run $srcdir/$subdir/$test.stp sleep_ten_secs $output_string diff --git a/testsuite/systemtap.samples/ioblocktest.stp b/testsuite/systemtap.samples/ioblocktest.stp index 1386903c..43b3e7d0 100644 --- a/testsuite/systemtap.samples/ioblocktest.stp +++ b/testsuite/systemtap.samples/ioblocktest.stp @@ -10,5 +10,5 @@ probe ioblock.end { } probe end { log("systemtap ending probe") - printf("%s\n", teststr) + printf("%s", teststr) } diff --git a/testsuite/systemtap.samples/tcptest.exp b/testsuite/systemtap.samples/tcptest.exp index 0c40f93d..0ae088ef 100644 --- a/testsuite/systemtap.samples/tcptest.exp +++ b/testsuite/systemtap.samples/tcptest.exp @@ -7,5 +7,7 @@ proc tcp_gen { } { exec $::tcp_tcl 1 return 0 } -set output_string "\\mTCP totalbytes: \\d+\\M" +set output_header "UID\tPID\tSIZE\tNAME\t\t\tPORT\tSOURCE\t\tRTO\tRCVMSS\tSSTHRES\tCWND\tSTATE\r\n" +set output_rows "((\\d+\t\\d+\t\\d+\t\\S+\t\t\t\\d+\t\\S*\t\\d+\t\\d+\t\\d+\t\\d+\t\\d+)?\r\n){5}" +set output_string "TCP totalbytes: \\d+\r\n$output_header$output_rows" stap_run $srcdir/$subdir/$test.stp tcp_gen $output_string |