From 8a2ce3a31365f6179f126912a4df85d07a59ca85 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Thu, 18 Aug 2016 15:42:42 +0200
Subject: [PATCH] VMS: synchronise tests with Unix

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 test/maketests.com |  9 +++++++--
 test/tests.com     | 24 +++++++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/test/maketests.com b/test/maketests.com
index 7e2d939bbe..3d16443ba7 100644
--- a/test/maketests.com
+++ b/test/maketests.com
@@ -147,9 +147,10 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
 	       "MDC2TEST,RMDTEST,"+ -
 	       "RANDTEST,DHTEST,ENGINETEST,"+ -
 	       "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
-	       "EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ -
+	       "EVP_TEST,EVP_EXTRA_TEST,IGETEST,JPAKETEST,SRPTEST,"+ -
 	       "ASN1TEST,V3NAMETEST,HEARTBEAT_TEST,"+ -
-	       "CONSTANT_TIME_TEST"
+	       "CONSTANT_TIME_TEST,VERIFY_EXTRA_TEST,"+ -
+               "CLIENTHELLOTEST,SSLV2CONFTEST"
 $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?
 $!
 $! Additional directory information.
@@ -183,6 +184,7 @@ $ T_D_EXPTEST    := [-.crypto.bn]
 $ T_D_DSATEST    := [-.crypto.dsa]
 $ T_D_RSA_TEST   := [-.crypto.rsa]
 $ T_D_EVP_TEST   := [-.crypto.evp]
+$ T_D_EVP_EXTRA_TEST := [-.crypto.evp]
 $ T_D_IGETEST    := [-.test]
 $ T_D_JPAKETEST  := [-.crypto.jpake]
 $ T_D_SRPTEST    := [-.crypto.srp]
@@ -190,6 +192,9 @@ $ T_D_V3NAMETEST := [-.crypto.x509v3]
 $ T_D_ASN1TEST   := [-.test]
 $ T_D_HEARTBEAT_TEST := [-.ssl]
 $ T_D_CONSTANT_TIME_TEST := [-.crypto]
+$ T_D_VERIFY_EXTRA_TEST := [-.crypto.x509]
+$ T_D_CLIENTHELLOTEST := [-.ssl]
+$ T_D_SSLV2CONFTEST := [-.ssl]
 $!
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
diff --git a/test/tests.com b/test/tests.com
index 6e1c818e7a..9361659982 100644
--- a/test/tests.com
+++ b/test/tests.com
@@ -55,9 +55,9 @@ $	    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_ige,-
+	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_constant_time,test_verify_extra,test_clienthello,test_sslv2conftest
 $	endif
 $	tests = f$edit(tests,"COLLAPSE")
 $
@@ -92,6 +92,7 @@ $	SSLTEST :=	ssltest
 $	RSATEST :=	rsa_test
 $	ENGINETEST :=	enginetest
 $	EVPTEST :=	evp_test
+$	EVPEXTRATEST :=	evp_extra_test
 $	IGETEST :=	igetest
 $	JPAKETEST :=	jpaketest
 $	SRPTEST :=	srptest
@@ -99,6 +100,9 @@ $	V3NAMETEST :=	v3nametest
 $	ASN1TEST :=	asn1test
 $	HEARTBEATTEST :=	heartbeat_test
 $	CONSTTIMETEST :=	constant_time_test
+$	VERIFYEXTRATEST :=	verify_extra_test
+$	CLIENTHELLOTEST :=	clienthellotest
+$	SSLV2CONFTEST := 	sslv2conftest
 $!
 $	tests_i = 0
 $ loop_tests:
@@ -112,6 +116,9 @@ $
 $ test_evp:
 $	mcr 'texe_dir''evptest' 'ROOT'.CRYPTO.EVP]evptests.txt
 $	return
+$ test_evp_extra:
+$	mcr 'texe_dir''evpextratest'
+$	return
 $ test_des:
 $	mcr 'texe_dir''destest'
 $	return
@@ -386,7 +393,18 @@ $ test_constant_time:
 $       write sys$output "Test constant time utilities"
 $       mcr 'texe_dir''consttimetest'
 $       return
-$
+$ test_verify_extra:
+$	write sys$output "''START' test_verify_extra"
+$	mcr 'texe_dir''verifyextratest'
+$       return
+$ test_clienthello:
+$	write sys$output "''START' test_clienthello"
+$	mcr 'texe_dir''clienthellotest'
+$       return
+$ test_sslv2conftest:
+$	write sys$output "''START' test_sslv2conftest"
+$	mcr 'texe_dir''sslv2conftest'
+$       return
 $
 $ exit:
 $	on error then goto exit2 ! In case openssl.exe didn't build.
-- 
2.34.1