Bug 1348809, reopened, keep chains.sh from being run on gyp build, r=franziskus

Reviewers: franziskus

Reviewed By: franziskus

Bug #: 1348809

Differential Revision: https://phabricator.services.mozilla.com/D213

1 files changed, 10 insertions, 10 deletions

diff --git a/tests/all.sh b/tests/all.sh
index 7c9448a46..d50b7078b 100755
--- a/tests/all.sh
+++ b/tests/all.sh
@@ -279,6 +279,16 @@ run_cycles()
 
 ############################## main code ###############################
 
+SCRIPTNAME=all.sh
+CLEANUP="${SCRIPTNAME}"
+cd `dirname $0`
+
+# all.sh should be the first one to try to source the init
+if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
+    cd common
+    . ./init.sh
+fi
+
 cycles="standard pkix upgradedb sharedb"
 CYCLES=${NSS_CYCLES:-$cycles}
 
@@ -305,16 +315,6 @@ NSS_SSL_TESTS="${NSS_SSL_TESTS:-$nss_ssl_tests}"
 nss_ssl_run="cov auth stapling stress"
 NSS_SSL_RUN="${NSS_SSL_RUN:-$nss_ssl_run}"
 
-SCRIPTNAME=all.sh
-CLEANUP="${SCRIPTNAME}"
-cd `dirname $0`
-
-# all.sh should be the first one to try to source the init
-if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
-    cd common
-    . ./init.sh
-fi
-
 # NOTE:
 # Lists of enabled tests and other settings are stored to ${ENV_BACKUP}
 # file and are are restored after every test cycle.