Make sure all tests are actually run, plus some fixups for things that

[openssl.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 3063bcad83898975274b7f5369bb2750d6106bba..6e07ddcd72e9982298f944679852fb03199615e6 100644 (file)
--- 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