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

10 files changed, 13 insertions, 13 deletions

diff --git a/testsuite/systemtap.printf/end1.exp b/testsuite/systemtap.printf/end1.exp
index 590340d3..ab1de590 100644
--- a/testsuite/systemtap.printf/end1.exp
+++ b/testsuite/systemtap.printf/end1.exp
@@ -11,15 +11,15 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -o $tmpfile $tpath} res]} {
-    untested $TEST_NAME
-    puts "$res"
+    fail $TEST_NAME
+    puts "stap failed: $res"
     catch {exec rm -f $tmpfile}
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
-    fail $TEST_NAME
     puts "$res"
+    fail $TEST_NAME
     catch {exec rm -f $tmpfile}
     return
 }
diff --git a/testsuite/systemtap.printf/end1b.exp b/testsuite/systemtap.printf/end1b.exp
index bea5736e..46cdc9c7 100644
--- a/testsuite/systemtap.printf/end1b.exp
+++ b/testsuite/systemtap.printf/end1b.exp
@@ -16,8 +16,8 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
-    untested $TEST_NAME
     puts "stap failed: $res"
+    fail $TEST_NAME
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
diff --git a/testsuite/systemtap.printf/mixed_out.exp b/testsuite/systemtap.printf/mixed_out.exp
index 3b66e7c0..55320e80 100644
--- a/testsuite/systemtap.printf/mixed_out.exp
+++ b/testsuite/systemtap.printf/mixed_out.exp
@@ -11,8 +11,8 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -DMAXACTION=100000 -o $tmpfile $tpath} res]} {
-    untested $TEST_NAME
-    puts "$res"
+    fail $TEST_NAME
+    puts "stap failed: $res"
     catch {exec rm -f $tmpfile}
     return
 }
diff --git a/testsuite/systemtap.printf/mixed_outb.exp b/testsuite/systemtap.printf/mixed_outb.exp
index db82cc79..c15520b1 100644
--- a/testsuite/systemtap.printf/mixed_outb.exp
+++ b/testsuite/systemtap.printf/mixed_outb.exp
@@ -16,7 +16,7 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -DMAXACTION=100000 -b -o $tmpfile $test} res]} {
-    untested $TEST_NAME
+    fail $TEST_NAME
     puts "stap failed: $res"
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
diff --git a/testsuite/systemtap.printf/out1.exp b/testsuite/systemtap.printf/out1.exp
index 7577a54d..f973ae00 100644
--- a/testsuite/systemtap.printf/out1.exp
+++ b/testsuite/systemtap.printf/out1.exp
@@ -11,7 +11,7 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -o $tmpfile $tpath} res]} {
-    untested $TEST_NAME
+    fail $TEST_NAME
     puts "$res"
     catch {exec rm -f $tmpfile}
     return
diff --git a/testsuite/systemtap.printf/out1b.exp b/testsuite/systemtap.printf/out1b.exp
index c3e21ba9..24efbf4c 100644
--- a/testsuite/systemtap.printf/out1b.exp
+++ b/testsuite/systemtap.printf/out1b.exp
@@ -16,7 +16,7 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
-    untested $TEST_NAME
+    fail $TEST_NAME
     puts "stap failed: $res"
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
diff --git a/testsuite/systemtap.printf/out2.exp b/testsuite/systemtap.printf/out2.exp
index ce1f7c6e..8c66e73d 100644
--- a/testsuite/systemtap.printf/out2.exp
+++ b/testsuite/systemtap.printf/out2.exp
@@ -11,7 +11,7 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -o $tmpfile $tpath} res]} {
-    untested $TEST_NAME
+    fail $TEST_NAME
     puts "$res"
     catch {exec rm -f $tmpfile}
     return
diff --git a/testsuite/systemtap.printf/out2b.exp b/testsuite/systemtap.printf/out2b.exp
index fcc12f63..70a98ea2 100644
--- a/testsuite/systemtap.printf/out2b.exp
+++ b/testsuite/systemtap.printf/out2b.exp
@@ -16,7 +16,7 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
-    untested $TEST_NAME
+    fail $TEST_NAME
     puts "stap failed: $res"
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
diff --git a/testsuite/systemtap.printf/out3.exp b/testsuite/systemtap.printf/out3.exp
index 51124757..63a67d8f 100644
--- a/testsuite/systemtap.printf/out3.exp
+++ b/testsuite/systemtap.printf/out3.exp
@@ -11,7 +11,7 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -DMAXACTION=100000 -o $tmpfile $tpath} res]} {
-    untested $TEST_NAME
+    fail $TEST_NAME
     puts "$res"
     catch {exec rm -f $tmpfile}
     return
diff --git a/testsuite/systemtap.printf/out3b.exp b/testsuite/systemtap.printf/out3b.exp
index 740a8b68..d49625e9 100644
--- a/testsuite/systemtap.printf/out3b.exp
+++ b/testsuite/systemtap.printf/out3b.exp
@@ -16,7 +16,7 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 }
 
 if {[catch {exec stap -DMAXACTION=100000 -b -o $tmpfile $test} res]} {
-    untested $TEST_NAME
+    fail $TEST_NAME
     puts "stap failed: $res"
     as_root "/bin/rm -f [glob ${tmpfile}*]"
     return