Make printf tests fail when stap fails.

2009-03-11  David Smith  <dsmith@redhat.com>

        * systemtap.printf/end1.exp: The test fails when stap fails.
        * systemtap.printf/end1b.exp: Ditto.
        * systemtap.printf/mixed_out.exp: Ditto.
        * systemtap.printf/mixed_outb.exp: Ditto.
        * systemtap.printf/out1.exp: Ditto.
        * systemtap.printf/out1b.exp: Ditto.
        * systemtap.printf/out2.exp: Ditto.
        * systemtap.printf/out2b.exp: Ditto.
        * systemtap.printf/out3.exp: Ditto.
        * systemtap.printf/out3b.exp: Ditto.

10 files changed, 13 insertions, 13 deletions

diff --git a/testsuite/systemtap.printf/end1.exp b/testsuite/systemtap.printf/end1.exp
index 0a4dd32e..e4f164f5 100644
--- a/testsuite/systemtap.printf/end1.exp
+++ b/testsuite/systemtap.printf/end1.exp
@@ -11,15 +11,15 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 1764a383..08cfa648 100644
--- a/testsuite/systemtap.printf/end1b.exp
+++ b/testsuite/systemtap.printf/end1b.exp
@@ -16,8 +16,8 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 093a8ca1..d73a55a6 100644
--- a/testsuite/systemtap.printf/mixed_out.exp
+++ b/testsuite/systemtap.printf/mixed_out.exp
@@ -11,8 +11,8 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 cbf7b920..30c0c92f 100644
--- a/testsuite/systemtap.printf/mixed_outb.exp
+++ b/testsuite/systemtap.printf/mixed_outb.exp
@@ -16,7 +16,7 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 f89d39bf..d5728c0f 100644
--- a/testsuite/systemtap.printf/out1.exp
+++ b/testsuite/systemtap.printf/out1.exp
@@ -11,7 +11,7 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 378ea5cd..2f702a2f 100644
--- a/testsuite/systemtap.printf/out1b.exp
+++ b/testsuite/systemtap.printf/out1b.exp
@@ -16,7 +16,7 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 7b312b11..dd96f394 100644
--- a/testsuite/systemtap.printf/out2.exp
+++ b/testsuite/systemtap.printf/out2.exp
@@ -11,7 +11,7 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 f7fdef6b..0b56c940 100644
--- a/testsuite/systemtap.printf/out2b.exp
+++ b/testsuite/systemtap.printf/out2b.exp
@@ -16,7 +16,7 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 c16db391..96ca2bc5 100644
--- a/testsuite/systemtap.printf/out3.exp
+++ b/testsuite/systemtap.printf/out3.exp
@@ -11,7 +11,7 @@ if {[catch {exec mktemp -t staptestXXXXX} 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 16ee2182..c42d03b7 100644
--- a/testsuite/systemtap.printf/out3b.exp
+++ b/testsuite/systemtap.printf/out3b.exp
@@ -16,7 +16,7 @@ if {[catch {exec mktemp -t staptestXXXXX} 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