New SSL test framework

[openssl.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index 2fb1f49985fb51db3080a6711016e9f2973c8f1e..aadf2c76704f7a2b51dccb1318480440b02f04a9 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -83,6 +83,10 @@ ASYNCTEST=   asynctest
 DTLSV1LISTENTEST = dtlsv1listentest
 CTTEST=        ct_test
 THREADSTEST=   threadstest
+AFALGTEST= afalgtest
+D2ITEST = d2i_test
+SSLTESTCTXTEST = ssl_test_ctx_test
+NEWSSLTEST = ssl_test
 
 TESTS=         alltests
 
@@ -104,7 +108,9 @@ 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) $(THREADSTEST)$(EXE_EXT)
+       $(DTLSV1LISTENTEST)$(EXE_EXT) $(CTTEST)$(EXE_EXT) $(THREADSTEST)$(EXE_EXT) \
+       $(AFALGTEST)$(EXE_EXT) $(D2ITEST)$(EXE_EXT) $(SSLTESTCTXTEST)$(EXE_EXT) \
+       $(NEWSSLTEST)$(EXE_EXT)
 
 # $(METHTEST)$(EXE_EXT)
 
@@ -122,7 +128,8 @@ OBJ=        $(NPTEST).o $(MEMLEAKTEST).o \
        $(HEARTBEATTEST).o $(P5_CRPT2_TEST).o \
        $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o $(CLIENTHELLOTEST).o \
        $(PACKETTEST).o $(ASYNCTEST).o $(DTLSV1LISTENTEST).o $(CTTEST).o \
-       $(THREADSTEST).o testutil.o
+       $(THREADSTEST).o testutil.o $(AFALGTEST).o $(D2ITEST).o ssl_test_ctx.o \
+       $(SSLTESTCTXTEST).o $(NEWSSLTEST).o handshake_helper.o
 
 SRC=   $(NPTEST).c $(MEMLEAKTEST).c \
        $(BNTEST).c $(ECTEST).c \
@@ -137,9 +144,10 @@ SRC=       $(NPTEST).c $(MEMLEAKTEST).c \
        $(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \
        $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c $(CLIENTHELLOTEST).c \
        $(PACKETTEST).c $(ASYNCTEST).c $(DTLSV1LISTENTEST).c $(CTTEST).c \
-       $(THREADSTEST).c testutil.c
+       $(THREADSTEST).c testutil.c $(AFALGTEST).c $(D2ITEST).c ssl_test_ctx.c \
+       $(SSLTESTCTXTEST).c $(NEWSSLTEST).c handshake_helper.c
 
-HEADER=        testutil.h
+HEADER=        testutil.h ssl_test_ctx.h handshake_helper.h
 
 ALL=   $(GENERAL) $(SRC) $(HEADER)
 
@@ -150,15 +158,13 @@ all:      exe
 
 exe:   $(EXE) dummytest$(EXE_EXT)
 
-files:
-       $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
 generate: $(SRC)
 $(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:
 
@@ -373,7 +379,7 @@ $(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)
@@ -382,4 +388,23 @@ $(THREADSTEST)$(EXE_EXT): $(THREADSTEST).o $(DLIBCRYPTO)
 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
        @target=dummytest; $(BUILD_CMD)
 
+$(AFALGTEST)$(EXE_EXT): $(AFALGTEST).o $(DLIBCRYPTO)
+       @target=$(AFALGTEST); $(BUILD_CMD)
+
+$(D2ITEST)$(EXE_EXT): $(D2ITEST).o $(DLIBCRYPTO) testutil.o
+       @target=$(D2ITEST) testutil=testutil.o; $(BUILD_CMD)
+
+$(SSLTESTCTXTEST)$(EXE_EXT): $(SSLTESTCTXTEST).o testutil.o $(DLIBCRYPTO)
+       @target=$(SSLTESTCTXTEST); $(BUILD_CMD)
+
+$(SSLTESTCTXTEST)$(EXE_EXT): $(SSLTESTCTXTEST).o testutil.o ssl_test_ctx.o \
+       $(DLIBCRYPTO)
+       @target=$(SSLTESTCTXTEST) testutil="testutil.o ssl_test_ctx.o"; \
+       $(BUILD_CMD)
+
+$(NEWSSLTEST)$(EXE_EXT): $(NEWSSLTEST).o testutil.o ssl_test_ctx.o \
+       handshake_helper.o $(DLIBSSL) $(DLIBCRYPTO)
+       @target=$(NEWSSLTEST) testutil="testutil.o ssl_test_ctx.o \
+       handshake_helper.o"; $(BUILD_CMD)
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.