Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	testsuite/ChangeLog

13 files changed, 44 insertions, 35 deletions

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index c3ee8d1e..c6f7ced8 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 2008-02-23  Frank Ch. Eigler  <fche@elastic.org>
 
+	* systemtap.printf/*.exp: Canonicalize pass/fail messages.
+
+2008-02-23  Frank Ch. Eigler  <fche@elastic.org>
+
+	* systemtap.samples/args.exp: Remove installation-specific paths from
+	pass/fail judgements.
+
+2008-02-23  Frank Ch. Eigler  <fche@elastic.org>
+
 	* */*.exp: Change all "send \003" to "exec kill -INT -<pgrp>" in order
 	to more reliably kill an inferior stap/stapio/staprun process group.
 
diff --git a/testsuite/systemtap.printf/end1.exp b/testsuite/systemtap.printf/end1.exp
index 36a2335e..0a4dd32e 100644
--- a/testsuite/systemtap.printf/end1.exp
+++ b/testsuite/systemtap.printf/end1.exp
@@ -18,12 +18,12 @@ if {[catch {exec stap -o $tmpfile $tpath} res]} {
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     puts "$res"
     catch {exec rm -f $tmpfile}
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 catch {exec rm -f $tmpfile}
 
diff --git a/testsuite/systemtap.printf/end1b.exp b/testsuite/systemtap.printf/end1b.exp
index e28dce5b..1764a383 100644
--- a/testsuite/systemtap.printf/end1b.exp
+++ b/testsuite/systemtap.printf/end1b.exp
@@ -24,18 +24,18 @@ if {[catch {exec stap -b -o $tmpfile $test} res]} {
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 as_root "/bin/rm -f [glob ${tmpfile}*]"
 
diff --git a/testsuite/systemtap.printf/mixed_out.exp b/testsuite/systemtap.printf/mixed_out.exp
index 6967f815..093a8ca1 100644
--- a/testsuite/systemtap.printf/mixed_out.exp
+++ b/testsuite/systemtap.printf/mixed_out.exp
@@ -18,12 +18,12 @@ if {[catch {exec stap -DMAXACTION=100000 -o $tmpfile $tpath} res]} {
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     puts "$res"
     catch {exec rm -f $tmpfile}
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 catch {exec rm -f $tmpfile}
 
diff --git a/testsuite/systemtap.printf/mixed_outb.exp b/testsuite/systemtap.printf/mixed_outb.exp
index 748dd0f2..cbf7b920 100644
--- a/testsuite/systemtap.printf/mixed_outb.exp
+++ b/testsuite/systemtap.printf/mixed_outb.exp
@@ -24,18 +24,18 @@ if {[catch {exec stap -DMAXACTION=100000 -b -o $tmpfile $test} res]} {
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 as_root "/bin/rm -f [glob ${tmpfile}*]"
 
diff --git a/testsuite/systemtap.printf/out1.exp b/testsuite/systemtap.printf/out1.exp
index 6a27d5be..f89d39bf 100644
--- a/testsuite/systemtap.printf/out1.exp
+++ b/testsuite/systemtap.printf/out1.exp
@@ -18,12 +18,12 @@ if {[catch {exec stap -o $tmpfile $tpath} res]} {
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     puts "$res"
     catch {exec rm -f $tmpfile}
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 catch {exec rm -f $tmpfile}
 
diff --git a/testsuite/systemtap.printf/out1b.exp b/testsuite/systemtap.printf/out1b.exp
index 6edb8772..378ea5cd 100644
--- a/testsuite/systemtap.printf/out1b.exp
+++ b/testsuite/systemtap.printf/out1b.exp
@@ -24,18 +24,18 @@ if {[catch {exec stap -b -o $tmpfile $test} res]} {
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 as_root "/bin/rm -f [glob ${tmpfile}*]"
 
diff --git a/testsuite/systemtap.printf/out2.exp b/testsuite/systemtap.printf/out2.exp
index 36d5d443..7b312b11 100644
--- a/testsuite/systemtap.printf/out2.exp
+++ b/testsuite/systemtap.printf/out2.exp
@@ -18,12 +18,12 @@ if {[catch {exec stap -o $tmpfile $tpath} res]} {
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     puts "$res"
     catch {exec rm -f $tmpfile}
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 catch {exec rm -f $tmpfile}
 
diff --git a/testsuite/systemtap.printf/out2b.exp b/testsuite/systemtap.printf/out2b.exp
index fc3301ab..f7fdef6b 100644
--- a/testsuite/systemtap.printf/out2b.exp
+++ b/testsuite/systemtap.printf/out2b.exp
@@ -24,18 +24,18 @@ if {[catch {exec stap -b -o $tmpfile $test} res]} {
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 as_root "/bin/rm -f [glob ${tmpfile}*]"
 
diff --git a/testsuite/systemtap.printf/out3.exp b/testsuite/systemtap.printf/out3.exp
index 8cf63d50..c16db391 100644
--- a/testsuite/systemtap.printf/out3.exp
+++ b/testsuite/systemtap.printf/out3.exp
@@ -18,12 +18,12 @@ if {[catch {exec stap -DMAXACTION=100000 -o $tmpfile $tpath} res]} {
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     puts "$res"
     catch {exec rm -f $tmpfile}
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 catch {exec rm -f $tmpfile}
 
diff --git a/testsuite/systemtap.printf/out3b.exp b/testsuite/systemtap.printf/out3b.exp
index af0d6be7..16ee2182 100644
--- a/testsuite/systemtap.printf/out3b.exp
+++ b/testsuite/systemtap.printf/out3b.exp
@@ -24,18 +24,18 @@ if {[catch {exec stap -DMAXACTION=100000 -b -o $tmpfile $test} res]} {
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
-    fail "$TEST_NAME failed"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
-pass "$TEST_NAME passed"
+pass $TEST_NAME
 as_root "/bin/rm -f [glob ${tmpfile}*]"
 
diff --git a/testsuite/systemtap.printf/string2.exp b/testsuite/systemtap.printf/string2.exp
index a64bfa38..f380337a 100644
--- a/testsuite/systemtap.printf/string2.exp
+++ b/testsuite/systemtap.printf/string2.exp
@@ -102,16 +102,16 @@ t is <12345678901234567890123456789012345678901234567890123456789012345678901234
 98: 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
 99: 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890}
 
-set TEST_NAME "$srcdir/$subdir/$test.stp"
+set TEST_NAME "$subdir/$test.stp"
 
 if {![installtest_p]} { untested $TEST_NAME; return }
 
-set res [exec stap $TEST_NAME]
+set res [exec stap $srcdir/$subdir/$test.stp]
 
 if {[string compare $res $::result_string] == 0} {
-      pass "$TEST_NAME passed"
+      pass $TEST_NAME
 } else {
-      fail "$TEST_NAME failed"
+      fail $TEST_NAME
       puts "EXPECTED:\n-----------------------\n<$::result_string>"
       puts "-----------------------\n"
       puts "GOT:\n-----------------------\n<$res>"
diff --git a/testsuite/systemtap.samples/args.exp b/testsuite/systemtap.samples/args.exp
index f6d5cec6..54647998 100644
--- a/testsuite/systemtap.samples/args.exp
+++ b/testsuite/systemtap.samples/args.exp
@@ -5,7 +5,7 @@ set stappath [exec which stap]
 set staprunpath [exec which staprun]
 
 if [file exists $staprunpath] {
-    pass "$test search for staprun ($staprunpath)"
+    pass "$test search for staprun"
 } else {
     fail "$test search for staprun"
     return
@@ -25,15 +25,15 @@ catch {close}; wait
 
 set modpath_cwd "$modname.ko"
 if [file exists $modpath_cwd] {
-    pass "$test search for probe module ($modpath_cwd)"
+    pass "$test search for probe module"
 } else {
-    fail "$test search for probe module ($modpath_cwd)"
+    fail "$test search for probe module"
     return
 }
 exec /bin/rm -f $modpath_cwd
 
 if [file exists $tmpdir] {
-    pass "$test search for tmpdir ($tmpdir)"
+    pass "$test search for tmpdir"
 } else {
     fail "$test search for tmpdir"
     return
@@ -41,9 +41,9 @@ if [file exists $tmpdir] {
 
 set modpath "$tmpdir/$modname.ko"
 if [file exists $modpath] {
-    pass "$test search for probe module ($modpath)"
+    pass "$test search for tmpdir probe module"
 } else {
-    fail "$test search for probe module ($modpath)"
+    fail "$test search for tmpdir probe module"
     return
 }