- Index: security/nss/tests/run_niscc.sh
- ===================================================================
- RCS file: /cvsroot/mozilla/security/nss/tests/run_niscc.sh,v
- retrieving revision 1.7
- diff -u -8 -p -r1.7 run_niscc.sh
- --- security/nss/tests/run_niscc.sh 13 Jul 2012 20:30:25 -0000 1.7
- +++ security/nss/tests/run_niscc.sh 27 Jul 2012 09:23:33 -0000
- @@ -303,33 +308,33 @@ init()
- # Pattern of core files, they should be created in current directory
- echo "core_pattern $(cat /proc/sys/kernel/core_pattern)" > "$TEST_OUTPUT/nisccLog00"
- # gmake is needed in the path for this suite to run
- echo "PATH $PATH" >> "$TEST_OUTPUT/nisccLog00"
- # Find out hacked NSS version
- - DISTTYPE=`cd "$NSS_HACK/mozilla/security/nss/tests/common"; gmake objdir_name`
- + DISTTYPE=`cd "$NSS_HACK/mozilla/security/nss/tests/common"; gmake -s objdir_name`
- echo "NSS_HACK DISTTYPE $DISTTYPE" >> "$TEST_OUTPUT/nisccLog00"
- export HACKBIN="$NSS_HACK/mozilla/dist/$DISTTYPE/bin"
- export HACKLIB="$NSS_HACK/mozilla/dist/$DISTTYPE/lib"
- if [ "$TEST_SYSTEM" = "false" ]; then
- # Find out nss version
- - DISTTYPE=`cd "$LOCALDIST/mozilla/security/nss/tests/common"; gmake objdir_name`
- + DISTTYPE=`cd "$LOCALDIST/mozilla/security/nss/tests/common"; gmake -s objdir_name`
- echo "NSS DISTTYPE $DISTTYPE" >> "$TEST_OUTPUT/nisccLog00"
- export TESTBIN="$LOCALDIST/mozilla/dist/$DISTTYPE/bin"
- export TESTLIB="$LOCALDIST/mozilla/dist/$DISTTYPE/lib"
- export TESTTOOLS="$TESTBIN"
- else
- # Using system installed NSS
- echo "USING SYSTEM NSS" >> "$TEST_OUTPUT/nisccLog00"
- export TESTBIN="/usr/bin"
- - if [ `uname -m` = "x86_64" ]; then
- + if [ USE_64 ]; then
- export TESTLIB="/usr/lib64"
- export TESTTOOLS="/usr/lib64/nss/unsupported-tools"
- else
- export TESTLIB="/usr/lib"
- export TESTTOOLS="/usr/lib/nss/unsupported-tools"
- fi
- fi