diff options
| author | slavomir.katuscak%sun.com <devnull@localhost> | 2008-03-27 12:37:32 +0000 |
|---|---|---|
| committer | slavomir.katuscak%sun.com <devnull@localhost> | 2008-03-27 12:37:32 +0000 |
| commit | 1dc18565ca09bc1282a0640b885154953546a000 (patch) | |
| tree | d281316c4a4bca7d5afe208be7ea8429ca6d36a6 | |
| parent | 8c2e50a9e0bb640b235c07bbd61557a56a7ca99d (diff) | |
| download | nss-hg-1dc18565ca09bc1282a0640b885154953546a000.tar.gz | |
Bug 232894: Added PKITS to all.sh. r=nelson
| -rwxr-xr-x | security/nss/tests/all.sh | 2 | ||||
| -rwxr-xr-x | security/nss/tests/pkits/pkits.sh | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/security/nss/tests/all.sh b/security/nss/tests/all.sh index 384c68bf1..746f845ab 100755 --- a/security/nss/tests/all.sh +++ b/security/nss/tests/all.sh @@ -97,7 +97,7 @@ run_tests() done } -tests="cipher perf libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge" +tests="cipher perf libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits" if [ -z "$BUILD_LIBPKIX_TESTS" ] ; then tests=`echo "${tests}" | sed -e "s/libpkix//"` fi diff --git a/security/nss/tests/pkits/pkits.sh b/security/nss/tests/pkits/pkits.sh index 4aa311154..6988fae35 100755 --- a/security/nss/tests/pkits/pkits.sh +++ b/security/nss/tests/pkits/pkits.sh @@ -72,6 +72,16 @@ pkits_init() . ./init.sh fi + if [ -z "${PKITS_DATA}" ]; then + echo "${SCRIPTNAME}: PKITS data directory not defined, skipping." + exit 0 + fi + + if [ ! -d "${PKITS_DATA}" ]; then + echo "${SCRIPTNAME}: PKITS data directory ${PKITS_DATA} doesn't exist, skipping." + exit 0 + fi + PKITSDIR=${HOSTDIR}/pkits COPYDIR=${PKITSDIR}/copydir @@ -80,12 +90,6 @@ pkits_init() mkdir -p ${COPYDIR} mkdir -p ${PKITSDIR}/html - if [ ! -d "${PKITS_DATA}" ]; then - PKITS_DATA=../../../../PKITS_DATA - fi - - export PKITS_DATA - certs=${PKITS_DATA}/certs crls=${PKITS_DATA}/crls |