X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2FMakefile;h=52056e28dc78786c288e81b9645333bffd43581f;hp=0b36ae5de42fb73b1defa56881ee5d434ad6c292;hb=0ebc965b9ca4352e407bb7cfa65ac235942117f6;hpb=509a83dd365f167a997d2855f6cd417fb43d3e75

diff --git a/test/Makefile b/test/Makefile
index 0b36ae5de4..52056e28dc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -267,7 +267,7 @@ test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl trsa testrsa.pem
 test_crl: ../apps/openssl tcrl testcrl.pem
 	@sh ./tcrl 2>/dev/null
 
-test_sid: ../apps/openssl tsid
+test_sid: ../apps/openssl tsid testsid.pem
 	@sh ./tsid 2>/dev/null
 
 test_req: ../apps/openssl treq testreq.pem testreq2.pem
@@ -313,12 +313,13 @@ test_dsa: $(DSATEST)
 	../util/shlib_wrap.sh ./$(DSATEST)
 	../util/shlib_wrap.sh ./$(DSATEST) -app2_1
 
-test_gen: ../apps/openssl testgen test.cnf
+test_gen testreq.pem: ../apps/openssl testgen test.cnf
 	@echo "Generate and verify a certificate request"
 	@sh ./testgen
 
 test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
-		intP1.ss intP2.ss: testss CAss.cnf Uss.cnf P1ss.cnf P2ss.cnf
+		intP1.ss intP2.ss: testss CAss.cnf Uss.cnf P1ss.cnf P2ss.cnf \
+                                   ../apps/openssl
 	@echo "Generate and certify a test certificate"
 	@sh ./testss
 	@cat certCA.ss certU.ss > intP1.ss
@@ -329,7 +330,8 @@ test_engine: $(ENGINETEST)
 	../util/shlib_wrap.sh ./$(ENGINETEST)
 
 test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
-		intP1.ss intP2.ss
+		intP1.ss intP2.ss $(SSLTEST) testssl testsslproxy \
+		../apps/server2.pem serverinfo.pem
 	@echo "test SSL protocol"
 	../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist
 	@sh ./testssl keyU.ss certU.ss certCA.ss
@@ -363,7 +365,7 @@ test_jpake: $(JPAKETEST)$(EXE_EXT)
 	@echo "Test JPAKE"
 	../util/shlib_wrap.sh ./$(JPAKETEST)
 
-test_cms: ../apps/openssl cms-test.pl
+test_cms: ../apps/openssl cms-test.pl smcont.txt
 	@echo "CMS consistency test"
 	$(PERL) cms-test.pl