Testsuite: tidy use of undef'd var

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 137f8dac600c095a2c83299a4ae001827540a304..8d96e13bda5f65f9d77b2657e5c1cd9bbe8af9b5 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -3920,7 +3920,7 @@ foreach my $tool (qw(exim_dumpdb exim_lock exinext exigrep eximstats exiqgrep ex
 # Collect some version information
 print '-' x 78, "\n";
 print "Perl version for runtest: $]\n";
-foreach (map { "./eximdir/$_" } qw(exigrep exinext eximstats exiqgrep)) {
+foreach (map { "./eximdir/$_" } qw(exigrep exinext eximstats exiqgrep exim_msgdate)) {
   # fold (or unfold?) multiline output into a one-liner
   print join(', ', map { chomp; $_ } `$_ --version`), "\n";
 }
@@ -4051,10 +4051,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++)
         {
         if (!defined $parm_malware{$1}) { $wantthis = 0; last; }
         }
-      elsif (/^feature (.*)$/)
+      elsif (/^(not )?feature (.*)$/)
         {
        # move to a subroutine?
-       my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $1";
+       my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $2";
 
        open (IN, "$parm_cwd/confs/0000") ||
          tests_exit(-1, "Couldn't open $parm_cwd/confs/0000: $!\n");
@@ -4069,10 +4069,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++)
        close(OUT);
 
        system($eximinfo . " >/dev/null 2>&1");
-       if ($? != 0) {
-         unlink("$parm_cwd/test-config");
+       if (!defined $1 && $? != 0 || defined $1 && $? == 0) {
          $wantthis = 0;
-         $_ = "feature $1";
+         unlink("$parm_cwd/test-config");
+         $_ = $1 || "" . "feature $2";
          last;
        }
        unlink("$parm_cwd/test-config");