Prepare for a possible disabling of certain messages that DEC C spews out.

[openssl.git] / test / Makefile.ssl

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 15323bdc513fa34d1c0bcdf34c8550170a3d9830..cbc5a09d173fe7696b86e1d66c7eecba18dd5616 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -98,9 +98,9 @@ tags:
 
 tests: exe apps \
        test_des test_idea test_sha test_md5 test_hmac test_md2 test_mdc2 \
-       test_rc2 test_rc4 test_rc5 test_bf test_cast \
+       test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast \
        test_rand test_bn test_enc test_x509 test_rsa test_crl test_sid \
-       test_reqgen test_req test_pkcs7 test_verify test_dh test_dsa \
+       test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
        test_ss test_ssl test_ca
 
 apps:
@@ -180,7 +180,12 @@ test_pkcs7:
 
 test_bn:
        @echo starting big number library test, could take a while...
-       @(./$(BNTEST)|bc) | awk '{ \
+# This *should* work:
+#      @(./$(BNTEST)|bc) | awk '{ \
+# Some broken bc's treat the pipe as a terminal :-(
+# By using a temporary file, errors detected by awk may be farther away from
+# the test that caused them; but even with the pipe there'd be some distance.
+       @(./$(BNTEST) >tmp.bntest; echo quit >>tmp.bntest; bc tmp.bntest) | awk '{ \
 if ($$0 != "0") {print "error"; exit(1); } \
 if (((NR+1)%64) == 0) print NR+1," tests done"; }'
        @echo 'test a^b%c implementations'
@@ -199,7 +204,7 @@ test_dsa:
        @echo "Generate as set of DSA parameters"
        ./$(DSATEST)
 
-test_reqgen:
+test_gen:
        @echo "Generate and verify a certificate request"
        @sh ./testgen
 
@@ -219,14 +224,14 @@ lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-       $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC)
+       $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(SRC)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss log
+       rm -f .rnd tmp.bntest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss log
 
 $(DLIBSSL):
        (cd ../ssl; $(MAKE))
@@ -327,10 +332,10 @@ dhtest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
 dhtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 dhtest.o: ../include/openssl/stack.h
 dsatest.o: ../include/openssl/bio.h ../include/openssl/bn.h
-dsatest.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
-dsatest.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
-dsatest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
-dsatest.o: ../include/openssl/stack.h
+dsatest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+dsatest.o: ../include/openssl/dsa.h ../include/openssl/err.h
+dsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+dsatest.o: ../include/openssl/rand.h ../include/openssl/stack.h
 exptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
 exptest.o: ../include/openssl/crypto.h ../include/openssl/err.h
 exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
@@ -362,8 +367,8 @@ rmdtest.o: ../include/openssl/ripemd.h
 rsa_oaep_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
 rsa_oaep_test.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
 rsa_oaep_test.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
-rsa_oaep_test.o: ../include/openssl/opensslv.h ../include/openssl/rsa.h
-rsa_oaep_test.o: ../include/openssl/stack.h
+rsa_oaep_test.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
+rsa_oaep_test.o: ../include/openssl/rsa.h ../include/openssl/stack.h
 sha1test.o: ../include/openssl/sha.h
 shatest.o: ../include/openssl/sha.h
 ssltest.o: ../include/openssl/asn1.h ../include/openssl/bio.h