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