diff options
| author | Kai Engert <kaie@kuix.de> | 2013-03-01 16:26:45 +0100 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2013-03-01 16:26:45 +0100 |
| commit | 6326748975ddf12ae15351ab3eac7f64b97a08ae (patch) | |
| tree | 68c1d716c3a2522ed95d084ec78c3d0f5e81e065 /tests | |
| parent | e790c9abc4b1c03006bffbbd1bb3a4cfafc62bb2 (diff) | |
| download | nss-hg-6326748975ddf12ae15351ab3eac7f64b97a08ae.tar.gz | |
Attempt to fix Windows specific test bustage, directory tests_results created one level too high
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/common/init.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/common/init.sh b/tests/common/init.sh index b2c87c6d5..b3d44b034 100644 --- a/tests/common/init.sh +++ b/tests/common/init.sh @@ -252,7 +252,6 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then export COMMON DIST=${DIST-${MOZILLA_ROOT}/dist} - SECURITY_ROOT=${SECURITY_ROOT-${MOZILLA_ROOT}/security/nss} TESTDIR=${TESTDIR-${MOZILLA_ROOT}/tests_results/security} # Allow for override options from a config file @@ -295,14 +294,14 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then # Same problem with MSYS/Mingw, except we need to start over with pwd -W if [ "${OS_ARCH}" = "WINNT" -a "$OS_NAME" = "MINGW32_NT" ]; then - mingw_mozilla_root=`(cd ../../../..; pwd -W)` + mingw_mozilla_root=`(cd ../../..; pwd -W)` MINGW_MOZILLA_ROOT=${MINGW_MOZILLA_ROOT-$mingw_mozilla_root} TESTDIR=${MINGW_TESTDIR-${MINGW_MOZILLA_ROOT}/tests_results/security} fi # Same problem with MSYS/Mingw, except we need to start over with pwd -W if [ "${OS_ARCH}" = "WINNT" -a "$OS_NAME" = "MINGW32_NT" ]; then - mingw_mozilla_root=`(cd ../../../..; pwd -W)` + mingw_mozilla_root=`(cd ../../..; pwd -W)` MINGW_MOZILLA_ROOT=${MINGW_MOZILLA_ROOT-$mingw_mozilla_root} TESTDIR=${MINGW_TESTDIR-${MINGW_MOZILLA_ROOT}/tests_results/security} fi @@ -577,7 +576,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then export PATH LD_LIBRARY_PATH SHLIB_PATH LIBPATH DYLD_LIBRARY_PATH export DOMSUF HOSTADDR export KILL PS - export MOZILLA_ROOT SECURITY_ROOT DIST TESTDIR OBJDIR QADIR + export MOZILLA_ROOT DIST TESTDIR OBJDIR QADIR export LOGFILE SCRIPTNAME #used for the distributed stress test, the server generates certificates |