From b3a14835513f472d131b88de1c7013fd2af0e795 Mon Sep 17 00:00:00 2001 From: "christophe.ravel.bugs%sun.com" Date: Mon, 4 Apr 2005 18:07:00 +0000 Subject: [PATCH] 283383 Create JSS and JSSE client/server test programs that intercommunicates to validate ciphers Java path and options are passed from all.pl to startJssServ.sh and startJsseServ.sh. --- security/jss/org/mozilla/jss/tests/all.pl | 4 ++-- security/jss/org/mozilla/jss/tests/startJssServ.sh | 12 +++++++++++- security/jss/org/mozilla/jss/tests/startJsseServ.sh | 12 +++++++++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/security/jss/org/mozilla/jss/tests/all.pl b/security/jss/org/mozilla/jss/tests/all.pl index 8bfcb0f047a..faacbaacff1 100644 --- a/security/jss/org/mozilla/jss/tests/all.pl +++ b/security/jss/org/mozilla/jss/tests/all.pl @@ -241,7 +241,7 @@ $result and die "Convert PKCS11 to PKCS12 returned $result"; # Start both JSS and JSSE servers # print STDERR "============= Start JSSE server tests\n"; -$result=system("./startJsseServ.$scriptext $jss_classpath $testdir"); +$result=system("./startJsseServ.$scriptext $jss_classpath $testdir $java"); $result >>=8; $result and die "JSSE servers returned $result"; @@ -258,7 +258,7 @@ $result and die "JSS client returned $result"; # Start both JSS and JSSE servers # print STDERR "============= Start JSS server tests\n"; -$result=system("./startJssServ.$scriptext $jss_classpath $testdir"); +$result=system("./startJssServ.$scriptext $jss_classpath $testdir $java"); $result >>=8; $result and die "JSS servers returned $result"; diff --git a/security/jss/org/mozilla/jss/tests/startJssServ.sh b/security/jss/org/mozilla/jss/tests/startJssServ.sh index c07d5ec8336..4cb970dc6d8 100755 --- a/security/jss/org/mozilla/jss/tests/startJssServ.sh +++ b/security/jss/org/mozilla/jss/tests/startJssServ.sh @@ -40,5 +40,15 @@ # # "Starting JSS JAA_SSLServer..." # -${JAVA_HOME}/bin/java -classpath $1 org.mozilla.jss.tests.JSS_SSLServer $2 passwords localhost JSSCATestCert true & +JSS_CLASSPATH=$1 +TESTDIR=$2 +shift 2 +JAVA_BIN_AND_OPT=$@ + +if [ -z "$JAVA_BIN_AND_OPT" ] ; +then + JAVA_BIN_AND_OPT=${JAVA_HOME}/bin/java +fi + +${JAVA_BIN_AND_OPT} -classpath ${JSS_CLASSPATH} org.mozilla.jss.tests.JSS_SSLServer ${TESTDIR} passwords localhost JSSCATestCert true & diff --git a/security/jss/org/mozilla/jss/tests/startJsseServ.sh b/security/jss/org/mozilla/jss/tests/startJsseServ.sh index 8d8988f962c..199ff8c0f26 100755 --- a/security/jss/org/mozilla/jss/tests/startJsseServ.sh +++ b/security/jss/org/mozilla/jss/tests/startJsseServ.sh @@ -40,5 +40,15 @@ # # "Starting JSSE JSSE_SSLServer Test..." # -${JAVA_HOME}/bin/java -classpath $1 org.mozilla.jss.tests.JSSE_SSLServer 29753 SSLv3 false & +JSS_CLASSPATH=$1 +TESTDIR=$2 +shift 2 +JAVA_BIN_AND_OPT=$@ + +if [ -z "$JAVA_BIN_AND_OPT" ] ; +then + JAVA_BIN_AND_OPT=${JAVA_HOME}/bin/java +fi + +${JAVA_BIN_AND_OPT} -classpath ${JSS_CLASSPATH} org.mozilla.jss.tests.JSSE_SSLServer 29753 SSLv3 false &