summaryrefslogtreecommitdiff
path: root/tests/all.sh
diff options
context:
space:
mode:
authorFranziskus Kiefer <franziskuskiefer@gmail.com>2016-06-27 13:33:19 +0200
committerFranziskus Kiefer <franziskuskiefer@gmail.com>2016-06-27 13:33:19 +0200
commit24179409470a151f199b21cbf59ce7baddd3c806 (patch)
tree220f233ce71dc34f1cd71d47c4e2ac24b69e6920 /tests/all.sh
parent9d29ce01971b3bc2754748cdcfcd2a304971da1f (diff)
downloadnss-hg-24179409470a151f199b21cbf59ce7baddd3c806.tar.gz
Bug 1227795 - allow disabling tests using pkix; add TC build, r=ttaubert
Diffstat (limited to 'tests/all.sh')
-rwxr-xr-xtests/all.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/all.sh b/tests/all.sh
index 5f77b862c..f1878fd98 100755
--- a/tests/all.sh
+++ b/tests/all.sh
@@ -261,7 +261,9 @@ run_cycles()
run_cycle_standard
;;
"pkix")
- run_cycle_pkix
+ if [ -z "$NSS_DISABLE_LIBPKIX" ]; then
+ run_cycle_pkix
+ fi
;;
"upgradedb")
run_cycle_upgrade_db