Synchronise tests with Unix.

[openssl.git] / test / tests.com

diff --git a/test/tests.com b/test/tests.com
index a7257d412ae91127e35521517341155e71673d4b..056082e7fe7ce2fbd316dbe36febbec173320139 100644 (file)
--- a/test/tests.com
+++ b/test/tests.com
@@ -21,14 +21,18 @@ $   else
 $          tests := -
        test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,-
        test_md2,test_mdc2,-
-       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_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_rd,-
+       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_ssl,test_rd
+       test_ss,test_ca,test_engine,test_evp,test_ssl
 $      endif
 $      tests = f$edit(tests,"COLLAPSE")
 $
 $      BNTEST :=       bntest
+$      ECTEST :=       ectest
+$      ECDSATEST :=    ecdsatest
+$      ECDHTEST :=     ecdhtest
 $      EXPTEST :=      exptest
 $      IDEATEST :=     ideatest
 $      SHATEST :=      shatest
@@ -52,6 +56,7 @@ $     METHTEST :=     methtest
 $      SSLTEST :=      ssltest
 $      RSATEST :=      rsa_test
 $      ENGINETEST :=   enginetest
+$      EVPTEST :=      evp_test
 $
 $      tests_i = 0
 $ loop_tests:
@@ -61,6 +66,9 @@ $     if tests_e .eqs. "," then goto exit
 $      gosub 'tests_e'
 $      goto loop_tests
 $
+$ test_evp:
+$      mcr 'texe_dir''evptest' evptests.txt
+$      return
 $ test_des:
 $      mcr 'texe_dir''destest'
 $      return
@@ -158,7 +166,7 @@ RECORD
 $      create/fdl=bntest-vms.fdl bntest-vms.sh
 $      open/append foo bntest-vms.sh
 $      type/output=foo: sys$input:
-<< __FOO__ bc | perl -e 'while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $1";} elsif (!/^0$/) {die "\nFailed! bc: $_";} print STDERR "."; $i++;} print STDERR "\n$i tests passed\n"'
+<< __FOO__ sh -c "`sh ./bctest`" | perl -e '$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $1";} elsif (!/^0$/) {die "\nFailed! bc: $_";} else {print STDERR "."; $i++;}} print STDERR "\n$i tests passed\n"'
 $      define/user sys$output bntest-vms.tmp
 $      mcr 'texe_dir''bntest'
 $      copy bntest-vms.tmp foo:
@@ -166,12 +174,25 @@ $ delete bntest-vms.tmp;*
 $      type/output=foo: sys$input:
 __FOO__
 $      close foo
-$      write sys$output "-- copy the [.test]bntest-vms.sh file to a Unix system and run it"
-$      write sys$output "-- through sh or bash to verify that the bignum operations went well."
+$      write sys$output "-- copy the [.test]bntest-vms.sh and [.test]bctest files to a Unix system and"
+$      write sys$output "-- run bntest-vms.sh through sh or bash to verify that the bignum operations"
+$      write sys$output "-- went well."
 $      write sys$output ""
 $      write sys$output "test a^b%c implementations"
 $      mcr 'texe_dir''exptest'
 $      return
+$ test_ec:
+$      write sys$output "test elliptic curves"
+$      mcr 'texe_dir''ectest'
+$      return
+$ test_ecdsa:
+$      write sys$output "test ecdsa"
+$      mcr 'texe_dir''ecdsatest'
+$      return
+$ test_ecdh:
+$      write sys$output "test ecdh"
+$      mcr 'texe_dir''ecdhtest'
+$      return
 $ test_verify:
 $      write sys$output "The following command should have some OK's and some failures"
 $      write sys$output "There are definitly a few expired certificates"
@@ -225,7 +246,7 @@ $       write sys$output "Generate and certify a test certificate via the 'ca' pro
 $          @testca.com
 $      endif
 $      return
-$ test_engine: 
+$ test_rd: 
 $      write sys$output "test Rijndael"
 $      !mcr 'texe_dir''rdtest'
 $      return