diff options
author | Jonas Allmann <jallmann@mozilla.com> | 2017-11-09 16:56:33 +0100 |
---|---|---|
committer | Jonas Allmann <jallmann@mozilla.com> | 2017-11-09 16:56:33 +0100 |
commit | 5b7052f25b3f4570a31b83e76f301fd2f5893a80 (patch) | |
tree | b3f01e5e351c90d55f4f45f79774ec3a9aab077f /tests/all.sh | |
parent | 969c0b78a8cb71f96c2eadb4f410b9b7dd038f4f (diff) | |
download | nss-hg-5b7052f25b3f4570a31b83e76f301fd2f5893a80.tar.gz |
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
Diffstat (limited to 'tests/all.sh')
-rwxr-xr-x | tests/all.sh | 20 |
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. |