From: Rob Percival <robpercival@google.com>
Date: Mon, 18 Jan 2016 10:26:17 +0000 (+0000)
Subject: Make TESTS= work with "nmake -f ms/ntdll.mak tests"
X-Git-Tag: OpenSSL_1_1_0-pre3~216
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b00387a0a3cc9e340915eeb878e5b45bbb9f1ccd;p=oweals%2Fopenssl.git

Make TESTS= work with "nmake -f ms/ntdll.mak tests"

This works on Linux with Make already, and allows running only specified
tests.

Reviewed-by: Ben Laurie <ben@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index c22acecfdd..98bd0ffcd2 100644
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -114,7 +114,7 @@ $target: $deps force.$target
 	set BIN_D=\$(BIN_D)
 	set TEST_D=\$(TEST_D)
 	set PERL=\$(PERL)
-	\$(PERL) test\\$test_cmd
+	\$(PERL) test\\$test_cmd \$(TESTS)
 force.$target:
 EOF
 }
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 1a34bb32fd..b9ae8a57ae 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -320,7 +320,7 @@ $target: $deps force.$target
 	set BIN_D=\$(BIN_D)
 	set TEST_D=\$(TEST_D)
 	set PERL=\$(PERL)
-	\$(PERL) test\\$test_cmd
+	\$(PERL) test\\$test_cmd \$(TESTS)
 force.$target:
 EOF
 }
diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index c1b2c26cf9..28bd0397c0 100644
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -203,7 +203,7 @@ sub do_test_rule {
     my $ret = <<"EOF";
 $target: $deps force.$target
 	TOP=. BIN_D=\$(BIN_D) TEST_D=\$(TEST_D) \\
-	    PERL=\$(PERL) \$(PERL) test/$test_cmd
+	    PERL=\$(PERL) \$(PERL) test/$test_cmd \$(TESTS)
 force.$target:
 
 EOF