зеркало из https://github.com/mozilla/gecko-dev.git
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.
This commit is contained in:
Родитель
2295f52e3f
Коммит
3c6218acb3
|
@ -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";
|
||||
|
||||
|
|
|
@ -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 &
|
||||
|
||||
|
|
|
@ -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 &
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче