From: Richard Levitte <levitte@openssl.org>
Date: Tue, 9 Sep 2003 09:10:45 +0000 (+0000)
Subject: Test data files should not be part of the TEST value, or util/mk1mf.pl
X-Git-Tag: BEN_FIPS_TEST_1~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c2cdb1a8770dcd795bad5591a63d9accd7b11a38;p=oweals%2Fopenssl.git

Test data files should not be part of the TEST value, or util/mk1mf.pl
gets confused...  The separate TESTDATA variable was inspired from
crypto/evp/Makefile.ssl.
---

diff --git a/fips/aes/Makefile.ssl b/fips/aes/Makefile.ssl
index 3ce47af76a..b199f754fe 100644
--- a/fips/aes/Makefile.ssl
+++ b/fips/aes/Makefile.ssl
@@ -19,7 +19,8 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=fips_aesavs.c fips_aes_data
+TEST=fips_aesavs.c
+TESTDATA=fips_aes_data
 APPS=
 
 LIB=$(TOP)/libcrypto.a
@@ -53,6 +54,7 @@ links:
 	@$(TOP)/util/point.sh Makefile.ssl Makefile
 	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
 	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
+	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)
 	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:
diff --git a/fips/sha1/Makefile.ssl b/fips/sha1/Makefile.ssl
index b1067d2eac..904297fd2f 100644
--- a/fips/sha1/Makefile.ssl
+++ b/fips/sha1/Makefile.ssl
@@ -19,7 +19,8 @@ AR=		ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST= fips_sha1test.c sha1vectors.txt sha1hashes.txt
+TEST= fips_sha1test.c
+TESTDATA= sha1vectors.txt sha1hashes.txt
 APPS=
 EXE= fips_standalone_sha1
 
@@ -61,6 +62,7 @@ links:
 	@$(TOP)/util/point.sh Makefile.ssl Makefile
 	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
 	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
+	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)
 	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install: