diff --git a/mozilla/security/nss/tests/cipher/performance.sh b/mozilla/security/nss/tests/cipher/performance.sh
index 3dbae0fa446..2a9e1258b78 100755
--- a/mozilla/security/nss/tests/cipher/performance.sh
+++ b/mozilla/security/nss/tests/cipher/performance.sh
@@ -1,4 +1,4 @@
-#! /bin/ksh
+#!/bin/sh
#
# This is just a quick script so we can still run our testcases.
# Longer term we need a scriptable test environment..
@@ -22,6 +22,13 @@ echo "" >> ${PERFRESULTS}
mkdir -p ${CIPHERDIR}
cd ${CIPHERDIR}
+if [ -z $1 ]; then
+ TESTSET="all"
+else
+ TESTSET=$1
+fi
+
+if [ $TESTSET = "all" -o $TESTSET = "symmkey" ]; then
echo "| Symmetric Key Cipher Performance |
|---|
" >> ${PERFRESULTS}
echo "| MODE | INPUT SIZE (bytes) | SYMMETRIC KEY SIZE (bits) | REPETITIONS (cx/op) | CONTEXT CREATION TIME (ms) | OPERATION TIME (ms) |
|---|
" >> ${PERFRESULTS}
@@ -49,6 +56,11 @@ do
fi
done
+echo "
" >> ${PERFRESULTS}
+
+fi
+
+if [ $TESTSET = "all" -o $TESTSET = "rsa" ]; then
cat ${RSATESTS} | while read mode keysize bufsize exp reps cxreps
do
if [ $mode != "#" ]; then
@@ -63,8 +75,6 @@ do
fi
done
-echo "
" >> ${PERFRESULTS}
-
echo "| RSA Cipher Performance |
|---|
" >> ${PERFRESULTS}
echo "| MODE | INPUT SIZE (bytes) | KEY SIZE (bits) | PUBLIC EXPONENT | REPETITIONS (cx/op) | CONTEXT CREATION TIME (ms) | OPERATION TIME (ms) |
|---|
" >> ${PERFRESULTS}
cat ${RSAPERFOUT} | while read md buf mod pe rps cxrps cx op
@@ -75,7 +85,9 @@ do
done
echo "
" >> ${PERFRESULTS}
+fi
+if [ $TESTSET = "all" -o $TESTSET = "dsa" ]; then
cat ${DSATESTS} | while read mode keysize bufsize reps cxreps
do
if [ $mode != "#" ]; then
@@ -100,7 +112,9 @@ do
done
echo "
" >> ${PERFRESULTS}
+fi
+if [ $TESTSET = "all" -o $TESTSET = "hash" ]; then
cat ${HASHTESTS} | while read mode bufsize reps
do
if [ $mode != "#" ]; then
@@ -122,6 +136,7 @@ do
done
echo "
" >> ${PERFRESULTS}
+fi
#rm -f ${TEMPFILES}
cd ${CURDIR}