From 16e8f21f336bcfc16a1174be8a8143668dbd0118 Mon Sep 17 00:00:00 2001
From: jistone <jistone>
Date: Fri, 8 Dec 2006 02:17:09 +0000
Subject: 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.
---
 testsuite/systemtap.base/maxactive.exp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'testsuite/systemtap.base/maxactive.exp')

diff --git a/testsuite/systemtap.base/maxactive.exp b/testsuite/systemtap.base/maxactive.exp
index b5cb7dd7..8754ff6e 100644
--- a/testsuite/systemtap.base/maxactive.exp
+++ b/testsuite/systemtap.base/maxactive.exp
@@ -3,6 +3,8 @@
 # Check to see if using the 'maxactive(N)' limit on return probes
 # works, by seeing if skipped probes increases when using it.
 
+load_lib "stap_run.exp"
+
 if {[info procs installtest_p] != "" && ![installtest_p]} {
     untested "MAXACTIVE"
     return
@@ -42,7 +44,8 @@ set script2 {
 }
 
 # Run script2 and save the number of skipped probes.
-stap_run "MAXACTIVE02" sleep_five_sec "" -e $script2
+set output_string "(WARNING: Number of errors: 0, skipped probes: \\d+\r\n)?"
+stap_run "MAXACTIVE02" sleep_five_sec $output_string -e $script2
 set skipped2 $skipped_probes
 
 # If the number of skipped probes for script 1 is less than the number
@@ -52,8 +55,8 @@ set skipped2 $skipped_probes
 # Note that this isn't 100% accurate based on the system load at the
 # time of the scripts.
 set test "MAXACTIVE03"
-if {$skipped1 < $skipped2} {
-    pass "$test ($skipped1 skipped probes < $skipped2 skipped probes)"
+if {$skipped1 <= $skipped2} {
+    pass "$test ($skipped1 skipped probes <= $skipped2 skipped probes)"
 } else {
     fail "$test ($skipped1 skipped probes > $skipped2 skipped probes)"
 }
-- 
cgit