aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2017-06-04 10:57:28 +1000
committerBen Elliston <bje@gnu.org>2017-06-04 10:57:28 +1000
commitc920074240e376dd336f2ec2d56ab67d8b910ab8 (patch)
treed7e7dfc3cd0991dde5fc7ef376c0e921f7438063
parentb0d3e27d5ac048a63c434edd222ffa05675c82f2 (diff)
downloaddejagnu-c920074240e376dd336f2ec2d56ab67d8b910ab8.zip
dejagnu-c920074240e376dd336f2ec2d56ab67d8b910ab8.tar.gz
dejagnu-c920074240e376dd336f2ec2d56ab67d8b910ab8.tar.bz2
Revert "* testsuite/runtest.all/libs.exp (process_test): Check if test has"
This reverts commit b0d3e27d5ac048a63c434edd222ffa05675c82f2.
-rw-r--r--ChangeLog5
-rw-r--r--testsuite/runtest.all/libs.exp12
2 files changed, 0 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index bedfcb8..bf804e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-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 c201258..7520e12 100644
--- a/testsuite/runtest.all/libs.exp
+++ b/testsuite/runtest.all/libs.exp
@@ -31,52 +31,40 @@ 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
}
}