2007-10-16 Martin Hunt <hunt@redhat.com>

	PR 5000
	* systemtap.printf/bin3.stp. Removed.
	* systemtap.printf/bin3a.stp. Renamed bin3.stp.
	* systemtap.printf/bin4.stp. Removed.
	* systemtap.printf/bin4a.stp. Renamed bin4.stp.
	* systemtap.printf/bin5.stp. Removed.
	* systemtap.printf/bin5a.stp. Renamed bin5.stp.
	* systemtap.printf/bin3.exp: Don't run bin3a.stp.
	* systemtap.printf/bin4.exp: Don't run bin4a.stp.
	* systemtap.printf/bin5.exp: Don't run bin5a.stp.

	Increase reliability under loads.
	* systemtap.samples/pfaults.exp: Increase MAXACTION.
	* systemtap.context/backtrace.tcl: Handle just
	a single userspace address.

11 files changed, 23 insertions, 79 deletions

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 5e04e64f..9f54311e 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2007-10-16  Martin Hunt  <hunt@redhat.com>
+
+	PR 5000
+	* systemtap.printf/bin3.stp. Removed.
+	* systemtap.printf/bin3a.stp. Renamed bin3.stp.	
+	* systemtap.printf/bin4.stp. Removed.
+	* systemtap.printf/bin4a.stp. Renamed bin4.stp.	
+	* systemtap.printf/bin5.stp. Removed.
+	* systemtap.printf/bin5a.stp. Renamed bin5.stp.	
+	* systemtap.printf/bin3.exp: Don't run bin3a.stp.	
+	* systemtap.printf/bin4.exp: Don't run bin4a.stp.
+	* systemtap.printf/bin5.exp: Don't run bin5a.stp.
+
+	Increase reliability under loads.
+	* systemtap.samples/pfaults.exp: Increase MAXACTION.
+	* systemtap.context/backtrace.tcl: Handle just
+	a single userspace address.
+
 2007-10-05  Frank Ch. Eigler  <fche@elastic.org>
 
 	PR 1119.
diff --git a/testsuite/systemtap.context/backtrace.tcl b/testsuite/systemtap.context/backtrace.tcl
index b632870b..e35832ee 100644
--- a/testsuite/systemtap.context/backtrace.tcl
+++ b/testsuite/systemtap.context/backtrace.tcl
@@ -94,17 +94,17 @@ expect {
 	incr m5
 	expect {
 	    -timeout 5
-	    -re {^ 0x[a-f0-9]+ : [^\r\n]+\r\n} {
+	    -re {^ 0x[a-f0-9]+[^\r\n]+\r\n} {
 		if {$m5 == 1} {incr m5}
 	    }
 	}
 	exp_continue
     }
-    -re {.*---\r\nthe profile stack is 0x[a-f0-9]+ [^\r\n]+\r\n} {
+    -re {.*---\r\nthe profile stack is 0x[a-f0-9]+[^\r\n]+\r\n} {
 	incr m6
 	expect {
 	    -timeout 5
-	    -re {.*---\r\n 0x[a-f0-9]+ : [^\r\n]+\r\n} {
+	    -re {.*---\r\n 0x[a-f0-9]+[^\r\n]+\r\n} {
 		if {$m6 == 1} {incr m6}
 	    }
 	}
diff --git a/testsuite/systemtap.printf/bin.stp b/testsuite/systemtap.printf/bin.stp
deleted file mode 100644
index ac86059d..00000000
--- a/testsuite/systemtap.printf/bin.stp
+++ /dev/null
@@ -1,18 +0,0 @@
-# test of 16-bit binary prints
-# need to use big_endian2() to get consistent results across 
-# different-endian architectures.
-
-probe begin 
-{
-	set_endian(2)
-	printf("%2b", 0x12)
-	printf("%2b", 0x34)
-	printf("%2b%2b", 0xabcd, 0x5678)
-	a = 0x12345678
-	b = 0xabcd
-	c = 0x8888
-	d = 0xcdef
-	printf("%2b%2b%2b%2b", a, b, c, d)
-	printf("a=%2b b=%2b c=%2b d=%2b",a,b,c,d)
-	exit()
-}
diff --git a/testsuite/systemtap.printf/bin3.exp b/testsuite/systemtap.printf/bin3.exp
index 18b0b4e4..b0d54c38 100644
--- a/testsuite/systemtap.printf/bin3.exp
+++ b/testsuite/systemtap.printf/bin3.exp
@@ -6,5 +6,3 @@ cd 20 63 3d 88 88 20 64
 
 set test "bin3"
 stap_run_binary $srcdir/$subdir/$test.stp
-set test "bin3a"
-stap_run_binary $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/bin3a.stp b/testsuite/systemtap.printf/bin3a.stp
deleted file mode 100644
index c0a30448..00000000
--- a/testsuite/systemtap.printf/bin3a.stp
+++ /dev/null
@@ -1,17 +0,0 @@
-# test of 16-bit binary prints
-# need to use big_endian2() to get consistent results across 
-# different-endian architectures.
-
-probe begin 
-{
-	printf("%2b", big_endian2(0x12))
-	printf("%2b", big_endian2(0x34))
-	printf("%2b%2b", big_endian2(0xabcd), big_endian2(0x5678))
-	a = big_endian2(0x12345678)
-	b = big_endian2(0xabcd)
-	c = big_endian2(0x8888)
-	d = big_endian2(0xcdef)
-	printf("%2b%2b%2b%2b", a, b, c, d)
-	printf("a=%2b b=%2b c=%2b d=%2b",a,b,c,d)
-	exit()
-}
diff --git a/testsuite/systemtap.printf/bin4.exp b/testsuite/systemtap.printf/bin4.exp
index 35105a8d..335b58c0 100644
--- a/testsuite/systemtap.printf/bin4.exp
+++ b/testsuite/systemtap.printf/bin4.exp
@@ -9,5 +9,3 @@ ef 00 00               }
 
 set test "bin4"
 stap_run_binary $srcdir/$subdir/$test.stp
-set test "bin4a"
-stap_run_binary $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/bin4a.stp b/testsuite/systemtap.printf/bin4a.stp
deleted file mode 100644
index 40bbec7f..00000000
--- a/testsuite/systemtap.printf/bin4a.stp
+++ /dev/null
@@ -1,16 +0,0 @@
-# test of 32-bit binary prints
-# Also tests big_endian4()
-
-probe begin 
-{
-	printf("%4b", big_endian4(0x12))
-	printf("%4b", big_endian4(0x34))
-	printf("%4b%4b", big_endian4(0xabcdef00), big_endian4(0x5678))
-	a = big_endian4(0x12345678)
-	b = big_endian4(0x11112222)
-	c = big_endian4(0x88889999)
-	d = big_endian4(0xcdef0000)
-	printf("%4b%4b%4b%4b", a, b, c, d)
-	printf("a=%4b b=%4b c=%4b d=%4b",a,b,c,d)
-	exit()
-}
diff --git a/testsuite/systemtap.printf/bin5.exp b/testsuite/systemtap.printf/bin5.exp
index 05069961..0f797f97 100644
--- a/testsuite/systemtap.printf/bin5.exp
+++ b/testsuite/systemtap.printf/bin5.exp
@@ -15,5 +15,3 @@ cd ef 20 62 3d 11 11 22
 
 set test "bin5"
 stap_run_binary $srcdir/$subdir/$test.stp
-set test "bin5a"
-stap_run_binary $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/bin5a.stp b/testsuite/systemtap.printf/bin5a.stp
deleted file mode 100644
index ebee2e01..00000000
--- a/testsuite/systemtap.printf/bin5a.stp
+++ /dev/null
@@ -1,17 +0,0 @@
-# test of 64-bit binary prints
-# need to use big_endian8() to get consistent results across 
-# different-endian architectures.
-
-probe begin 
-{
-	printf("%8b", big_endian8(0x12))
-	printf("%8b", big_endian8(0x34))
-	printf("%8b%8b", big_endian8(0xabcd000011112222), big_endian8(0x5678567856785678))
-	a = big_endian8(0x0012345678abcdef)
-	b = big_endian8(0x1111222233334444)
-	c = big_endian8(0x88889999aaaabbbb)
-	d = big_endian8(0xcdef000011112222)
-	printf("%8b%8b%8b%8b", a, b, c, d)
-	printf("a=%8b b=%8b c=%8b d=%8b",a,b,c,d)
-	exit()
-}
diff --git a/testsuite/systemtap.samples/pfaults.exp b/testsuite/systemtap.samples/pfaults.exp
index 7675078c..2cab7c14 100644
--- a/testsuite/systemtap.samples/pfaults.exp
+++ b/testsuite/systemtap.samples/pfaults.exp
@@ -1,7 +1,7 @@
 set test "pfaults"
 if {![installtest_p]} { untested $test; return }
 
-spawn stap -g $srcdir/$subdir/pfaults.stp
+spawn stap -DMAXACTION=10000 -g $srcdir/$subdir/pfaults.stp
 set pid $spawn_id
 set ok 0
 expect {
diff --git a/testsuite/systemtap.samples/profile.exp b/testsuite/systemtap.samples/profile.exp
index 249a1589..9ca9da15 100644
--- a/testsuite/systemtap.samples/profile.exp
+++ b/testsuite/systemtap.samples/profile.exp
@@ -1,7 +1,7 @@
 set test "profile"
 if {![installtest_p]} { untested $test; return }
 
-spawn stap $srcdir/$subdir/profile.stp
+spawn stap -DMAXMAPENTRIES=10000 $srcdir/$subdir/profile.stp
 set ok 0
 expect {
     -timeout 360