From: Andy Polyakov <appro@openssl.org>
Date: Mon, 12 Oct 2015 20:26:14 +0000 (+0200)
Subject: Harmonize do_rehash_rule with updated test/recipies/25-test_verify.t.
X-Git-Tag: OpenSSL_1_1_0-pre1~431
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=82987e6119403661c45f781a8b6748941c15ade6;p=oweals%2Fopenssl.git

Harmonize do_rehash_rule with updated test/recipies/25-test_verify.t.

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

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 9d8a47df4b..491a1bb276 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -779,8 +779,8 @@ reallyclean:
 
 EOF
 
-$rules .= &do_rehash_rule("rehash", "certs apps");
-$rules .= &do_test_rule("test", "rehash", "run_tests.pl");
+$rules .= &do_rehash_rule("rehash.time", "certs apps");
+$rules .= &do_test_rule("test", "rehash.time", "run_tests.pl");
 
 my $platform_cpp_symbol = "MK1MF_PLATFORM_$platform";
 $platform_cpp_symbol =~ s/-/_/g;
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index a2d35c6eea..8cb4835180 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -307,6 +307,7 @@ $target: $deps
 	set OPENSSL=\$(BIN_D)${o}openssl.exe
 	set OPENSSL_DEBUG_MEMORY=on
 	\$(PERL) tools/c_rehash certs/demo
+	echo off > $target
 EOF
     return $ret
 }
diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 528d4d0e4f..c1fa1ffb88 100644
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -193,7 +193,8 @@ $target: $deps
 	(OPENSSL="`pwd`/util/opensslwrap.sh"; \\
 	OPENSSL_DEBUG_MEMORY=on; \\
 	export OPENSSL OPENSSL_DEBUG_MEMORY; \\
-	\$(PERL) tools/c_rehash certs/demo)
+	\$(PERL) tools/c_rehash certs/demo; \\
+	touch $target)
 EOF
     return $ret
 }