diff options
author | Richard Levitte <levitte@openssl.org> | 2008-12-16 10:54:28 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2008-12-16 10:54:28 +0000 |
commit | 26397d2e8cdd147cf4025e46b803a9d607c32be5 (patch) | |
tree | a84a159ff8a7b48299d05a04628e1c3dbb1023a0 /test | |
parent | 85b2c0ce7fdf597d60d8c366e8f7de24f674fc5a (diff) |
Synchronise VMS build system with the Unixly one
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile | 15 | ||||
-rw-r--r-- | test/tests.com | 13 |
2 files changed, 20 insertions, 8 deletions
diff --git a/test/Makefile b/test/Makefile index 5f8dc741d8..c515d1ac4c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -60,6 +60,7 @@ RSATEST= rsa_test ENGINETEST= enginetest EVPTEST= evp_test IGETEST= igetest +JPAKETEST= jpaketest TESTS= alltests @@ -70,7 +71,7 @@ EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST) $(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \ $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \ $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \ - $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) jpaketest$(EXE_EXT) + $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) # $(METHTEST)$(EXE_EXT) @@ -82,7 +83,7 @@ OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \ $(MDC2TEST).o $(RMDTEST).o \ $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \ $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \ - $(EVPTEST).o $(IGETEST).o jpaketest.o + $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \ $(HMACTEST).c $(WPTEST).c \ @@ -90,7 +91,7 @@ SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \ $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \ $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \ - $(EVPTEST).c $(IGETEST).c jpaketest.c + $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c EXHEADER= HEADER= $(EXHEADER) @@ -299,9 +300,9 @@ test_ige: $(IGETEST)$(EXE_EXT) @echo "Test IGE mode" ../util/shlib_wrap.sh ./$(IGETEST) -test_jpake: jpaketest$(EXE_EXT) +test_jpake: $(JPAKETEST)$(EXE_EXT) @echo "Test JPAKE" - ../util/shlib_wrap.sh ./jpaketest + ../util/shlib_wrap.sh ./$(JPAKETEST) lint: lint -DLINT $(INCLUDES) $(SRC)>fluff @@ -433,8 +434,8 @@ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) @target=$(IGETEST); $(BUILD_CMD) -jpaketest$(EXE_EXT): jpaketest.o $(DLIBCRYPTO) - @target=jpaketest; $(BUILD_CMD) +$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) + @target=$(JPAKETEST); $(BUILD_CMD) #$(AESTEST).o: $(AESTEST).c # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c diff --git a/test/tests.com b/test/tests.com index 315ce4445f..b3ebd57951 100644 --- a/test/tests.com +++ b/test/tests.com @@ -25,7 +25,8 @@ $ tests := - test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,- test_enc,test_x509,test_rsa,test_crl,test_sid,- test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,- - test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa + test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,- + test_jpake $ endif $ tests = f$edit(tests,"COLLAPSE") $ @@ -58,6 +59,8 @@ $ SSLTEST := ssltest $ RSATEST := rsa_test $ ENGINETEST := enginetest $ EVPTEST := evp_test +$ IGETEST := igetest +$ JPAKETEST := jpaketest $ $ tests_i = 0 $ loop_tests: @@ -267,6 +270,14 @@ $ else $ @testtsa.com $ endif $ return +$ test_ige: +$ write sys$output "Test IGE mode" +$ mcr 'texe_dir''igetest' +$ return +$ test_jpake: +$ write sys$output "Test JPAKE" +$ mcr 'texe_dir''jpaketest' +$ return $ $ $ exit: |