X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bd0f95ded48f560cb1f9f8b808e1abaabeb4d4ec..da1702c0e2fd5b5b4300bbae3f21db7ac5d74198:/test/runtest?ds=inline

diff --git a/test/runtest b/test/runtest
index 82ae480ce..8d96e13bd 100755
--- a/test/runtest
+++ b/test/runtest
@@ -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");