Commit 66e70832 authored by Richard Levitte's avatar Richard Levitte Committed by Matt Caswell
Browse files

Have dtlstest run on VMS as well 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 26aebca7

test/maketests.com

+21 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ - 
	       "EVP_TEST,EVP_EXTRA_TEST,IGETEST,JPAKETEST,SRPTEST,"+ -

	       "ASN1TEST,V3NAMETEST,HEARTBEAT_TEST,"+ -

	       "CONSTANT_TIME_TEST,VERIFY_EXTRA_TEST,"+ -

               "CLIENTHELLOTEST,SSLV2CONFTEST"

               "CLIENTHELLOTEST,SSLV2CONFTEST,DTLSTEST"

$! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?

$!

$! Additional directory information.
@@ -195,6 +195,9 @@ $ T_D_CONSTANT_TIME_TEST := [-.crypto] 
$ T_D_VERIFY_EXTRA_TEST := [-.crypto.x509]

$ T_D_CLIENTHELLOTEST := [-.ssl]

$ T_D_SSLV2CONFTEST := [-.ssl]

$ T_D_DTLSTEST   := [-.ssl]

$

$ EXOBJ_DTLSTEST := SSLTESTLIB

$!

$ TCPIP_PROGRAMS = ",,"

$ IF COMPILER .EQS. "VAXC" THEN -
@@ -227,10 +230,21 @@ $! 
$! Create The Object File Name.

$!

$ OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"

$ OBJECT_FILES = OBJECT_FILE

$!

$! Create The Executable File Name.

$!

$ EXE_FILE = EXE_DIR + FILE_NAME + ".EXE"

$!

$! Do the same for the possible extra unit

$!

$ IF F$TYPE(EXOBJ_'FILE_NAME') .NES. ""

$ THEN

$   EXOBJ_SOURCE_FILE = "SYS$DISK:" + EXOBJ_'FILE_NAME' + ".C"

$   EXOBJ_OBJECT_FILE = OBJ_DIR + EXOBJ_'FILE_NAME' + ".OBJ"

$   OBJECT_FILES = OBJECT_FILES + "," + EXOBJ_OBJECT_FILE

$ ENDIF

$!

$ ON WARNING THEN GOTO NEXT_FILE

$!

$! Check To See If The File We Want To Compile Actually Exists.
@@ -257,6 +271,10 @@ $! Compile The File. 
$!

$ ON ERROR THEN GOTO NEXT_FILE

$ CC /OBJECT='OBJECT_FILE' 'SOURCE_FILE'

$ IF F$TYPE(EXOBJ_'FILE_NAME') .NES. ""

$ THEN

$   CC /OBJECT='EXOBJ_OBJECT_FILE' 'EXOBJ_SOURCE_FILE'

$ ENDIF

$ ON WARNING THEN GOTO NEXT_FILE

$!

$! Check If What We Are About To Compile Works Without A TCP/IP Library.
@@ -280,7 +298,7 @@ $! 
$!  Don't Link With The RSAREF Routines And TCP/IP Library.

$!

$ LINK /'DEBUGGER' /'LINKMAP' /'TRACEBACK' /EXECTABLE = 'EXE_FILE' -

   'OBJECT_FILE', -

   'OBJECT_FILES', -

   'SSL_LIB' /LIBRARY, -

   'CRYPTO_LIB' /LIBRARY -

   'TCPIP_LIB' -
@@ -480,7 +498,7 @@ $ CHECK_OPTIONS: 
$!

$! Set basic C compiler /INCLUDE directories.

$!

$ CC_INCLUDES = "SYS$DISK:[-],SYS$DISK:[-.CRYPTO]"

$ CC_INCLUDES = "SYS$DISK:[-],SYS$DISK:[-.CRYPTO],SYS$DISK:[-.TEST]"

$!

$! Check To See If P1 Is Blank.

$!

test/tests.com

+6 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ $ tests := - 
	test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-

	test_ss,test_ca,test_engine,test_evp,test_evp_extra,test_ssl,test_tsa,test_ige,-

	test_jpake,test_srp,test_cms,test_ocsp,test_v3name,test_heartbeat,-

	test_constant_time,test_verify_extra,test_clienthello,test_sslv2conftest

	test_constant_time,test_verify_extra,test_clienthello,test_sslv2conftest,test_dtls

$	endif

$	tests = f$edit(tests,"COLLAPSE")

$
@@ -103,6 +103,7 @@ $ CONSTTIMETEST := constant_time_test 
$	VERIFYEXTRATEST :=	verify_extra_test

$	CLIENTHELLOTEST :=	clienthellotest

$	SSLV2CONFTEST := 	sslv2conftest

$	DTLSTEST :=	dtlstest

$!

$	tests_i = 0

$ loop_tests:
@@ -405,6 +406,10 @@ $ test_sslv2conftest: 
$	write sys$output "''START' test_sslv2conftest"

$	mcr 'texe_dir''sslv2conftest'

$       return

$ test_dtls:

$	write sys$output "''START' test_dtls"

$	mcr 'texe_dir''dtlstest' 'ROOT'.APPS]server.pem 'ROOT'.APPS]server.pem

$	return

$

$ exit:

$	on error then goto exit2 ! In case openssl.exe didn't build.