summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrelyea%netscape.com <devnull@localhost>2000-06-20 17:48:23 +0000
committerrelyea%netscape.com <devnull@localhost>2000-06-20 17:48:23 +0000
commitf36e80a0bbbffde1f64c930600dadb9e63b26d65 (patch)
tree6912c8d55d241330d83cfd2d65a182c0294b2a41
parentc49c2d1066f57651f1726f8f46b0662c898f0ab1 (diff)
downloadnss-hg-f36e80a0bbbffde1f64c930600dadb9e63b26d65.tar.gz
Use the correct PATH syntax for NT (';' instead of ':')
-rwxr-xr-xsecurity/nss/tests/common/arch.sh1
-rw-r--r--security/nss/tests/common/init.sh4
2 files changed, 5 insertions, 0 deletions
diff --git a/security/nss/tests/common/arch.sh b/security/nss/tests/common/arch.sh
index 8cfac27a2..b2f6475c4 100755
--- a/security/nss/tests/common/arch.sh
+++ b/security/nss/tests/common/arch.sh
@@ -295,6 +295,7 @@ fi
OBJDIR_NAME=${OS_CONFIG}${CPU_TAG}${COMPILER_TAG}${LIBC_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}'.OBJ'
#export OS_CONFIG OS_ARCH OBJDIR_NAME OS_RELEASE OBJDIR_TAG
+export OS_ARCH
if [ ${OS_ARCH} = "WINNT" ]; then
if [ ${OS_TARGET} != "WIN16" ]; then
diff --git a/security/nss/tests/common/init.sh b/security/nss/tests/common/init.sh
index fb3225dc2..019483922 100644
--- a/security/nss/tests/common/init.sh
+++ b/security/nss/tests/common/init.sh
@@ -12,7 +12,11 @@ SECURITY_ROOT=${SECURITY_ROOT-${MOZILLA_ROOT}/security/nss}
TESTDIR=${TESTDIR-${MOZILLA_ROOT}/tests_results/security}
. ../common/arch.sh
OBJDIR=${OBJDIR_NAME}
+if [ ${OS_ARCH} == "WINNT" ]; then
+PATH=${DIST}/${OBJDIR}/bin\;${DIST}/${OBJDIR}/lib\;$PATH
+else
PATH=${DIST}/${OBJDIR}/bin:${DIST}/${OBJDIR}/lib:$PATH
+fi
export PATH
LD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib
export LD_LIBRARY_PATH