From dc7a5981269d9e18037f3c31bc1f5d520554ad7c Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 19 Jun 2014 16:40:06 +0200
Subject: [PATCH] runtests.pl: Don't expect $TESTDIR/DISABLED to exist
If a non-standard $TESTDIR is used the file may not be necessary.
Previously a "missing" file resulted in the warning:
readline() on closed filehandle D at ./runtests.pl line 4940.
---
tests/runtests.pl | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/tests/runtests.pl b/tests/runtests.pl
index da71414f88..a20af2c7b3 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -4865,20 +4865,21 @@ if(!$listonly) {
}
#######################################################################
-# Fetch all disabled tests
+# Fetch all disabled tests, if there are any
#
-open(D, "<$TESTDIR/DISABLED");
-while(<D>) {
- if(/^ *\#/) {
- # allow comments
- next;
- }
- if($_ =~ /(\d+)/) {
- $disabled{$1}=$1; # disable this test number
+if(open(D, "<$TESTDIR/DISABLED")) {
+ while(<D>) {
+ if(/^ *\#/) {
+ # allow comments
+ next;
+ }
+ if($_ =~ /(\d+)/) {
+ $disabled{$1}=$1; # disable this test number
+ }
}
+ close(D);
}
-close(D);
#######################################################################
# If 'all' tests are requested, find out all test numbers
--
GitLab