aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tom@codesourcery.com>2017-06-04 10:52:02 +1000
committerBen Elliston <bje@gnu.org>2017-06-04 10:52:02 +1000
commitb0d3e27d5ac048a63c434edd222ffa05675c82f2 (patch)
treeee08fc8eef1a92200a22b3b621353137c0ccd9fc
parentf3817d617ee6c8c1edd04a7fc68daee6dbc4d9c2 (diff)
downloaddejagnu-b0d3e27d5ac048a63c434edd222ffa05675c82f2.zip
dejagnu-b0d3e27d5ac048a63c434edd222ffa05675c82f2.tar.gz
dejagnu-b0d3e27d5ac048a63c434edd222ffa05675c82f2.tar.bz2
* testsuite/runtest.all/libs.exp (process_test): Check if test has
reportable output. Signed-off-by: Ben Elliston <bje@gnu.org>
-rw-r--r--ChangeLog5
-rw-r--r--testsuite/runtest.all/libs.exp12
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bf804e3..bedfcb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-04 Tom de Vries <tom@codesourcery.com>
+
+ * testsuite/runtest.all/libs.exp (process_test): Check if test has
+ reportable output.
+
2017-03-11 Thomas Preud'homme <thomas.preudhomme@arm.com>
* lib/remote.exp (remote_download): Add logging message when
diff --git a/testsuite/runtest.all/libs.exp b/testsuite/runtest.all/libs.exp
index 7520e12..c201258 100644
--- a/testsuite/runtest.all/libs.exp
+++ b/testsuite/runtest.all/libs.exp
@@ -31,40 +31,52 @@ proc process_test { test } {
if [file exists $test] {
verbose "Processing test $test" 2
+ set n 0
spawn -open [open "|$EXPECT $test $srcdir $subdir [pwd]" r]
expect {
"No such file or directory" {
perror "$test wouldn't run" 0
+ set n [expr $n + 1]
}
-re "\[\r\n\]*NOTSUPPORTED: $text\[\r\n\]*" {
unsupported "[lrange $expect_out(0,string) 1 end]"
+ set n [expr $n + 1]
exp_continue
}
-re "\[\r\n\]*NOTTESTED: $text\[\r\n\]*" {
untested "[lrange $expect_out(0,string) 1 end]"
+ set n [expr $n + 1]
exp_continue
}
-re "\[\r\n\]*PASSED: $text\[\r\n\]*" {
pass "[lrange $expect_out(0,string) 1 end]"
+ set n [expr $n + 1]
exp_continue
}
-re "\[\r\n\]*FAILED: $text\[\r\n\]*" {
fail "[lrange $expect_out(0,string) 1 end]"
+ set n [expr $n + 1]
exp_continue
}
-re "\[\r\n\]*WARNED: $text\[\r\n\]*" {
verbose "$expect_out(0,string)" 2
+ set n [expr $n + 1]
exp_continue
}
-re "\[\r\n\]*ERRORED: $text\[\r\n\]*" {
verbose "$expect_out(0,string)" 2
+ set n [expr $n + 1]
exp_continue
}
timeout {
perror "$test timed out" 0
+ set n [expr $n + 1]
exp_continue
}
eof {
+ if { $n == 0 } {
+ perror "$test gives no reportable output" 0
+ }
verbose "All Done" 3
}
}