consistent test-start logging

Output a consistent "start" marker for each test.
Remove "2>/dev/null" from Makefile command lines.
Add OPENSSL_CONFIG=/dev/null for places where it's needed, in
order to suppress a warning message from the openssl CLI.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/test/Makefile b/test/Makefile
index 851901bfd7eea4c1201c281f9d88f602f8b84bd3..13b92852ca1f2910a0bca1207021b8e922240814 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -29,6 +29,9 @@ LIBCRYPTO= -L.. -lcrypto
 LIBSSL= -L.. -lssl
 LIBFIPS= -L.. -lfips
 
+# Prefix for logline for each test
+START= @@@ START
+
 BNTEST=                bntest
 ECTEST=                ectest
 ECDSATEST=     ecdsatest
@@ -150,210 +153,248 @@ alltests: \
        test_constant_time
 
 test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
 
 test_evp_extra: $(EVPEXTRATEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(EVPEXTRATEST)
 
 test_p5_crpt2: $(P5_CRPT2_TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(P5_CRPT2_TEST)
 
 test_des: $(DESTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(DESTEST)
 
 test_idea: $(IDEATEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(IDEATEST)
 
 test_sha: $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT)
+       @echo $(START) $@ -- sha1
        ../util/shlib_wrap.sh ./$(SHA1TEST)
+       @echo $(START) $@ -- sha256
        ../util/shlib_wrap.sh ./$(SHA256TEST)
+       @echo $(START) $@ -- sha512
        ../util/shlib_wrap.sh ./$(SHA512TEST)
 
 test_mdc2: $(MDC2TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(MDC2TEST)
 
 test_md5: $(MD5TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(MD5TEST)
 
 test_md4: $(MD4TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(MD4TEST)
 
 test_hmac: $(HMACTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(HMACTEST)
 
 test_wp: $(WPTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(WPTEST)
 
 test_md2: $(MD2TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(MD2TEST)
 
 test_rmd: $(RMDTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RMDTEST)
 
 test_bf: $(BFTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(BFTEST)
 
 test_cast: $(CASTTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(CASTTEST)
 
 test_rc2: $(RC2TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RC2TEST)
 
 test_rc4: $(RC4TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RC4TEST)
 
 test_rc5: $(RC5TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RC5TEST)
 
 test_rand: $(RANDTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RANDTEST)
 
 test_gost2814789: $(GOST2814789TEST)$(EXE_EXT)
+       @echo $(START) $@
        OPENSSL_ENGINES=../engines/ccgost ../util/shlib_wrap.sh ./$(GOST2814789TEST)
 
 test_enc: ../apps/openssl$(EXE_EXT) testenc
+       @echo $(START) $@
        @sh ./testenc
 
 test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pem
-       echo test normal x509v1 certificate
-       sh ./tx509 2>/dev/null
-       echo test first x509v3 certificate
-       sh ./tx509 v3-cert1.pem 2>/dev/null
-       echo test second x509v3 certificate
-       sh ./tx509 v3-cert2.pem 2>/dev/null
+       @echo $(START) $@ -- x509v1 certificate
+       sh ./tx509
+       @echo $(START) $@ -- first x509v3 certificate
+       sh ./tx509 v3-cert1.pem
+       @echo $(START) $@ -- second x509v3 certificate
+       sh ./tx509 v3-cert2.pem
 
 test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) tkey testrsa.pem
-       @sh ./tkey testrsa.pem rsa private 2>/dev/null
-       @sh ./tkey testrsapub.pem rsa public 2>/dev/null
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RSATEST)
+       @echo $(START) $@ -- private key
+       @sh ./tkey testrsa.pem rsa private
+       @echo $(START) $@ -- public public
+       @sh ./tkey testrsapub.pem rsa public
 
 test_crl: ../apps/openssl$(EXE_EXT) tcrl testcrl.pem
-       @sh ./tcrl 2>/dev/null
+       @echo $(START) $@
+       sh ./tcrl
 
 test_sid: ../apps/openssl$(EXE_EXT) tsid testsid.pem
-       @sh ./tsid 2>/dev/null
+       @echo $(START) $@
+       @sh ./tsid
 
 test_req: ../apps/openssl$(EXE_EXT) treq testreq.pem testreq2.pem
-       @sh ./treq 2>/dev/null
-       @sh ./treq testreq2.pem 2>/dev/null
+       @echo $(START) $@
+       @sh ./treq
+       @echo $(START) $@ -- testreq2
+       @sh ./treq testreq2.pem
 
 test_pkcs7: ../apps/openssl$(EXE_EXT) tpkcs7 tpkcs7d testp7.pem pkcs7-1.pem
-       @sh ./tpkcs7 2>/dev/null
-       @sh ./tpkcs7d 2>/dev/null
+       @echo $(START) $@ -- pkcs7
+       @sh ./tpkcs7
+       @echo $(START) $@ -- pkcs7d
+       @sh ./tpkcs7d
 
 test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
-       @echo starting big number library test, could take a while...
+       @echo $(START) $@ -- could take  a while.
        @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
        @echo quit >>tmp.bntest
-       @echo "running bc"
+       @echo $(START) $@ -- running bc
        @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0\r?$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
-       @echo 'test a^b%c implementations'
+       @echo $(START) $@ -- $(EXPTEST)
        ../util/shlib_wrap.sh ./$(EXPTEST)
 
 test_ec: $(ECTEST)$(EXE_EXT) tkey testec-p256.pem
-       @echo 'test elliptic curves'
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(ECTEST)
-       @sh ./tkey testec-p256.pem ec private 2>/dev/null
-       @sh ./tkey testecpub-p256.pem ec public 2>/dev/null
+       @echo $(START) $@ -- private
+       @sh ./tkey testec-p256.pem ec private
+       @echo $(START) $@ -- public
+       @sh ./tkey testecpub-p256.pem ec public
 
 test_ecdsa: $(ECDSATEST)$(EXE_EXT)
-       @echo 'test ecdsa'
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(ECDSATEST)
 
 test_ecdh: $(ECDHTEST)$(EXE_EXT)
-       @echo 'test ecdh'
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(ECDHTEST)
 
 test_verify: ../apps/openssl$(EXE_EXT)
-       @echo "The following command should have some OK's and some failures"
-       @echo "There are definitly a few expired certificates"
-       ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
+       @echo $(START) $@ -- expect some failures and expired certificates
+       OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
 
 test_dh: $(DHTEST)$(EXE_EXT)
-       @echo "Generate a set of DH parameters"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(DHTEST)
 
 test_dsa: $(DSATEST)$(EXE_EXT) tkey testdsa.pem
-       @echo "Generate a set of DSA parameters"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(DSATEST)
+       @echo $(START) $@ -- app2_1
        ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
-       @sh ./tkey testdsa.pem dsa private 2>/dev/null
-       @sh ./tkey testdsapub.pem dsa public 2>/dev/null
+       @echo $(START) $@ -- private
+       @sh ./tkey testdsa.pem dsa private
+       @echo $(START) $@ -- public
+       @sh ./tkey testdsapub.pem dsa public
 
 test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf
-       @echo "Generate and verify a certificate request"
+       @echo $(START) test_gen
        @sh ./testgen
 
 test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
                intP1.ss intP2.ss: testss CAss.cnf Uss.cnf P1ss.cnf P2ss.cnf \
                                    ../apps/openssl$(EXE_EXT)
-       @echo "Generate and certify a test certificate"
+       @echo $(START) test_ss
        @sh ./testss
        @cat certCA.ss certU.ss > intP1.ss
        @cat certCA.ss certU.ss certP1.ss > intP2.ss
 
 test_engine: $(ENGINETEST)$(EXE_EXT)
-       @echo "Manipulate the ENGINE structures"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(ENGINETEST)
 
 test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
                intP1.ss intP2.ss $(SSLTEST)$(EXE_EXT) testssl testsslproxy \
                ../apps/server2.pem serverinfo.pem
-       @echo "test SSL protocol"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist
+       @echo $(START) $@ -- key U
        @sh ./testssl keyU.ss certU.ss certCA.ss
+       @echo $(START) $@ -- key P1
        @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
+       @echo $(START) $@ -- key P2
        @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
 
 test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
-       @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
-         echo "skipping CA.sh test -- requires RSA"; \
+       @if OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
+         echo SKIP $@ -- requires RSA; \
        else \
-         echo "Generate and certify a test certificate via the 'ca' program"; \
+         echo $(START) $@; \
          sh ./testca; \
        fi
 
 test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
-       @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
-         echo "skipping testtsa test -- requires RSA"; \
+       @if OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
+           echo SKIP $@ -- requires RSA; \
        else \
+         echo $(START) $@; \
          sh ./testtsa; \
        fi
 
 test_ige: $(IGETEST)$(EXE_EXT)
-       @echo "Test IGE mode"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(IGETEST)
 
 test_jpake: $(JPAKETEST)$(EXE_EXT)
-       @echo "Test JPAKE"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(JPAKETEST)
 
 test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt
-       @echo "CMS consistency test"
-       $(PERL) cms-test.pl
+       @echo $(START) $@
+       OPENSSL_CONFIG=/dev/null $(PERL) cms-test.pl
 
 test_srp: $(SRPTEST)$(EXE_EXT)
-       @echo "Test SRP"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./srptest
 
 test_v3name: $(V3NAMETEST)$(EXE_EXT)
-       @echo "Test X509v3_check_*"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(V3NAMETEST)
 
 test_ocsp: ../apps/openssl$(EXE_EXT) tocsp
-       @echo "Test OCSP"
+       @echo $(START) $@
        @sh ./tocsp
 
 test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
 
 test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
-       @echo "Test constant time utilites"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(CONSTTIMETEST)
 
-lint:
-       lint -DLINT $(INCLUDES) $(SRC)>fluff
-
 depend:
        @if [ -z "$(THIS)" ]; then \
            $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \

diff --git a/test/tcrl b/test/tcrl
index 1075a4f3f502e3c5fd663775b7598b0b49d63920..216bb8a05063adaafa11f47363247d86b29fe794 100644 (file)
--- a/test/tcrl
+++ b/test/tcrl
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 cmd='../util/shlib_wrap.sh ../apps/openssl crl'
 
 if [ "$1"x != "x" ]; then

diff --git a/test/testca b/test/testca
index b109cfe271f329919b1f0cb3521ddb63da6f957d..2cffeb717b7a277e2a8ad12e91225cd7ebe08fc4 100644 (file)
--- a/test/testca
+++ b/test/testca
@@ -15,7 +15,7 @@ OPENSSL="`pwd`/../util/opensslwrap.sh"
 export OPENSSL
 
 /bin/rm -fr demoCA
-$SH ../apps/CA.sh -newca <<EOF
+OPENSSL_CONFIG=/dev/null $SH ../apps/CA.sh -newca <<EOF
 EOF
 
 if [ $? != 0 ]; then
@@ -47,5 +47,3 @@ if [ $? != 0 ]; then
 fi
 
 /bin/rm -fr demoCA newcert.pem newreq.pem
-#usage: CA -newcert|-newreq|-newca|-sign|-verify
-

diff --git a/test/testenc b/test/testenc
index d9fd52e533195a7c95c1592e3fcd6da41e8bcfd2..6ca9caddc1ef302d8e232fe80d81b646edc618b1 100644 (file)
--- a/test/testenc
+++ b/test/testenc
@@ -2,6 +2,8 @@
 
 testsrc=testenc
 test=./p
+
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 cmd="../util/shlib_wrap.sh ../apps/openssl"
 
 cat $testsrc >$test;

diff --git a/test/testgen b/test/testgen
index 524c0d134c89416b8c6715f9977780b5da308471..ed53b4a5af53e76cd832d28c38e0bbb27792ec21 100644 (file)
--- a/test/testgen
+++ b/test/testgen
@@ -3,6 +3,7 @@
 T=testcert
 KEY=512
 CA=../certs/testca.pem
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 
 /bin/rm -f $T.1 $T.2 $T.key
 

diff --git a/test/testss b/test/testss
index 1a426857d31e16569867a24c11b1006a14db92ec..c846b772514d705639c217db28d92d6f683510f6 100644 (file)
--- a/test/testss
+++ b/test/testss
@@ -5,6 +5,7 @@ reqcmd="../util/shlib_wrap.sh ../apps/openssl req"
 x509cmd="../util/shlib_wrap.sh ../apps/openssl x509 $digest"
 verifycmd="../util/shlib_wrap.sh ../apps/openssl verify"
 dummycnf="../apps/openssl.cnf"
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 
 CAkey="keyCA.ss"
 CAcert="certCA.ss"
@@ -40,7 +41,7 @@ else
   req_new='-new'
 fi
 
-$reqcmd -config $CAconf -out $CAreq -keyout $CAkey $req_new #>err.ss
+$reqcmd -config $CAconf -out $CAreq -keyout $CAkey $req_new
 if [ $? != 0 ]; then
        echo "error using 'req' to generate a certificate request"
        exit 1
@@ -158,6 +159,4 @@ echo The second generated proxy certificate is $P2cert
 echo The second generated proxy private key is $P2key
 
 /bin/rm err.ss
-#/bin/rm $P1intermediate
-#/bin/rm $P2intermediate
 exit 0

diff --git a/test/testssl b/test/testssl
index 71b4d2a271367262da3ca2f408ca5f310791083e..367807b47bf133c6712d2dac01d2d2dd89e3271a 100644 (file)
--- a/test/testssl
+++ b/test/testssl
@@ -10,6 +10,7 @@ if [ "$2" = "" ]; then
 else
   cert="$2"
 fi
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 ssltest="../util/shlib_wrap.sh ./ssltest -key $key -cert $cert -c_key $key -c_cert $cert"
 
 if ../util/shlib_wrap.sh ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then

diff --git a/test/tkey b/test/tkey
index 611ed7dfdee12c3b979f2f88a8a16020a88e807c..b7097e6f6f77d350c4b7d087eb2c8d47a5f55a84 100644 (file)
--- a/test/tkey
+++ b/test/tkey
@@ -4,6 +4,7 @@ t=$1
 ktype=$2
 ptype=$3
 
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 if ../util/shlib_wrap.sh ../apps/openssl no-$ktype; then
   echo skipping $ktype $ptype conversion test
   exit 0

diff --git a/test/tocsp b/test/tocsp
index 5fc291ca6eeb72a97eb9b274f7750b2dc2d2a279..ac9114515b3b920443a8cc4f3b3479a827f974a0 100644 (file)
--- a/test/tocsp
+++ b/test/tocsp
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 cmd='../util/shlib_wrap.sh ../apps/openssl'
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 ocspdir="ocsp-tests"
 # 17 December 2012 so we don't get certificate expiry errors.
 check_time="-attime 1355875200"

diff --git a/test/tpkcs7 b/test/tpkcs7
index d7029a03268b3f06ebcc813853888fd3796321bc..27bd34398d6f2b7d46568b3e099c2953dd5c6af0 100644 (file)
--- a/test/tpkcs7
+++ b/test/tpkcs7
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7'
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 
 if [ "$1"x != "x" ]; then
        t=$1

diff --git a/test/tpkcs7d b/test/tpkcs7d
index d4bfbdf1cd6d647b8db60d5f80a4056f7af0e16b..4354d59c802c9fb834e67850eaa4f475b40ca773 100644 (file)
--- a/test/tpkcs7d
+++ b/test/tpkcs7d
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7'
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 
 if [ "$1"x != "x" ]; then
        t=$1

diff --git a/test/treq b/test/treq
index 420d25e16899f9e057b20ab3165a4f53422c038e..82decceebe2f08eb354e718b17a8f51706797575 100644 (file)
--- a/test/treq
+++ b/test/treq
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 cmd='../util/shlib_wrap.sh ../apps/openssl req -config ../apps/openssl.cnf'
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 
 if [ "$1"x != "x" ]; then
        t=$1
@@ -19,9 +20,6 @@ cp $t req-fff.p
 echo "p -> d"
 $cmd -in req-fff.p -inform p -outform d >req-f.d
 if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in req-fff.p -inform p -outform t >req-f.t
-#if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"
 $cmd -in req-fff.p -inform p -outform p >req-f.p
 if [ $? != 0 ]; then exit 1; fi
@@ -29,29 +27,14 @@ if [ $? != 0 ]; then exit 1; fi
 echo "d -> d"
 $cmd -verify -in req-f.d -inform d -outform d >req-ff.d1
 if [ $? != 0 ]; then exit 1; fi
-#echo "t -> d"
-#$cmd -in req-f.t -inform t -outform d >req-ff.d2
-#if [ $? != 0 ]; then exit 1; fi
 echo "p -> d"
 $cmd -verify -in req-f.p -inform p -outform d >req-ff.d3
 if [ $? != 0 ]; then exit 1; fi
 
-#echo "d -> t"
-#$cmd -in req-f.d -inform d -outform t >req-ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#echo "t -> t"
-#$cmd -in req-f.t -inform t -outform t >req-ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in req-f.p -inform p -outform t >req-ff.t3
-#if [ $? != 0 ]; then exit 1; fi
 
 echo "d -> p"
 $cmd -in req-f.d -inform d -outform p >req-ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#echo "t -> p"
-#$cmd -in req-f.t -inform t -outform p >req-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
 echo "p -> p"
 $cmd -in req-f.p -inform p -outform p >req-ff.p3
 if [ $? != 0 ]; then exit 1; fi
@@ -65,17 +48,8 @@ if [ $? != 0 ]; then exit 1; fi
 cmp req-fff.p req-ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
-#cmp req-f.t req-ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.t req-ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.t req-ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
 cmp req-f.p req-ff.p1
 if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.p req-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
 cmp req-f.p req-ff.p3
 if [ $? != 0 ]; then exit 1; fi
 

diff --git a/test/tsid b/test/tsid
index e1eb503f085d6e680eefd0e9d0d7184d48c70c42..c80438343a2fbf5a078c940397bcf9e22ccac971 100644 (file)
--- a/test/tsid
+++ b/test/tsid
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 cmd='../util/shlib_wrap.sh ../apps/openssl sess_id'
 
 if [ "$1"x != "x" ]; then

diff --git a/test/tx509 b/test/tx509
index 0ce3b5223c5bcf4aeb7ef35e97b2c243432c2fec..4e9c0a54f291854226573798806d1f1837269cc7 100644 (file)
--- a/test/tx509
+++ b/test/tx509
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 cmd='../util/shlib_wrap.sh ../apps/openssl x509'
 
 if [ "$1"x != "x" ]; then