Don't define OPENSSL_ENGINES in test recipes, do it in Makefiles instead

[openssl.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index 0b6938c00185d269a4eeacbf169ba15a48927142..be4f0623f51ed9a3150e3b06b344ec6c63f52114 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -82,6 +82,8 @@ SSLSKEWITH0PTEST=     sslskewith0ptest
 ASYNCTEST=     asynctest
 DTLSV1LISTENTEST = dtlsv1listentest
 CTTEST=        ct_test
+THREADSTEST=   threadstest
+AFALGTEST= afalgtest
 
 TESTS=         alltests
 
@@ -103,7 +105,8 @@ EXE=        $(NPTEST)$(EXE_EXT) $(MEMLEAKTEST)$(EXE_EXT) \
        $(HEARTBEATTEST)$(EXE_EXT) $(P5_CRPT2_TEST)$(EXE_EXT) \
        $(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT) \
        $(CLIENTHELLOTEST)$(EXE_EXT) $(PACKETTEST)$(EXE_EXT) $(ASYNCTEST)$(EXE_EXT) \
-       $(DTLSV1LISTENTEST)$(EXE_EXT) $(CTTEST)$(EXE_EXT)
+       $(DTLSV1LISTENTEST)$(EXE_EXT) $(CTTEST)$(EXE_EXT) $(THREADSTEST)$(EXE_EXT) \
+       $(AFALGTEST)$(EXE_EXT)
 
 # $(METHTEST)$(EXE_EXT)
 
@@ -120,7 +123,8 @@ OBJ=        $(NPTEST).o $(MEMLEAKTEST).o \
        $(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(V3NAMETEST).o \
        $(HEARTBEATTEST).o $(P5_CRPT2_TEST).o \
        $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o $(CLIENTHELLOTEST).o \
-       $(PACKETTEST).o $(ASYNCTEST).o $(DTLSV1LISTENTEST).o $(CTTEST).o testutil.o
+       $(PACKETTEST).o $(ASYNCTEST).o $(DTLSV1LISTENTEST).o $(CTTEST).o \
+       $(THREADSTEST).o testutil.o $(AFALGTEST).o
 
 SRC=   $(NPTEST).c $(MEMLEAKTEST).c \
        $(BNTEST).c $(ECTEST).c \
@@ -134,7 +138,8 @@ SRC=        $(NPTEST).c $(MEMLEAKTEST).c \
        $(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(V3NAMETEST).c \
        $(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \
        $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c $(CLIENTHELLOTEST).c \
-       $(PACKETTEST).c $(ASYNCTEST).c $(DTLSV1LISTENTEST).c $(CTTEST).c testutil.c
+       $(PACKETTEST).c $(ASYNCTEST).c $(DTLSV1LISTENTEST).c $(CTTEST).c \
+       $(THREADSTEST).c testutil.c $(AFALGTEST).c
 
 HEADER=        testutil.h
 
@@ -155,7 +160,8 @@ $(SRC):
        @sh $(TOP)/util/point.sh dummytest.c $@
 
 tests: exe apps
-       TOP=$(TOP) PERL=$(PERL) $(PERL) run_tests.pl $(TESTS)
+       OPENSSL_ENGINES=../engines TOP=$(TOP) PERL=$(PERL) \
+               $(PERL) run_tests.pl $(TESTS)
 
 errors:
 
@@ -370,10 +376,16 @@ $(ASYNCTEST)$(EXE_EXT): $(ASYNCTEST).o
 $(DTLSV1LISTENTEST)$(EXE_EXT): $(DTLSV1LISTENTEST).o
        @target=$(DTLSV1LISTENTEST) $(BUILD_CMD)
 
-$(CTTEST)$(EXE_EXT): $(CTTEST).o testutil.o
+$(CTTEST)$(EXE_EXT): $(CTTEST).o $(DLIBCRYPTO) testutil.o
        @target=$(CTTEST) testutil=testutil.o;  $(BUILD_CMD)
 
+$(THREADSTEST)$(EXE_EXT): $(THREADSTEST).o $(DLIBCRYPTO)
+       @target=$(THREADSTEST) $(BUILD_CMD)
+
 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
        @target=dummytest; $(BUILD_CMD)
 
+$(AFALGTEST)$(EXE_EXT): $(AFALGTEST).o $(DLIBCRYPTO)
+       @target=$(AFALGTEST); $(BUILD_CMD)
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.