diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-06-27 13:33:19 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-06-27 13:33:19 +0200 |
| commit | 24179409470a151f199b21cbf59ce7baddd3c806 (patch) | |
| tree | 220f233ce71dc34f1cd71d47c4e2ac24b69e6920 | |
| parent | 9d29ce01971b3bc2754748cdcfcd2a304971da1f (diff) | |
| download | nss-hg-24179409470a151f199b21cbf59ce7baddd3c806.tar.gz | |
Bug 1227795 - allow disabling tests using pkix; add TC build, r=ttaubert
| -rw-r--r-- | automation/taskcluster/graph/linux/build64-debug.yml | 23 | ||||
| -rwxr-xr-x | tests/all.sh | 4 | ||||
| -rwxr-xr-x | tests/chains/chains.sh | 6 | ||||
| -rwxr-xr-x | tests/ssl/ssl.sh | 4 |
4 files changed, 33 insertions, 4 deletions
diff --git a/automation/taskcluster/graph/linux/build64-debug.yml b/automation/taskcluster/graph/linux/build64-debug.yml index e64a3e4b0..9d494c831 100644 --- a/automation/taskcluster/graph/linux/build64-debug.yml +++ b/automation/taskcluster/graph/linux/build64-debug.yml @@ -152,3 +152,26 @@ groupSymbol: Builds groupName: Various builds symbol: noPkcs11Bypass + +- task: + metadata: + name: "Linux 64 (debug, NO_BUILD_LIBPKIX=1)" + description: "Linux 64 (debug, NO_BUILD_LIBPKIX=1)" + + payload: + env: + NSS_ENABLE_TLS_1_3: 1 + NO_BUILD_LIBPKIX: 1 + USE_64: 1 + + extra: + treeherder: + build: + platform: linux64 + machine: + platform: linux64 + collection: + debug: true + groupSymbol: Builds + groupName: Various builds + symbol: noLibpkix 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 diff --git a/tests/chains/chains.sh b/tests/chains/chains.sh index b53d928cf..4c3fa57a0 100755 --- a/tests/chains/chains.sh +++ b/tests/chains/chains.sh @@ -1212,9 +1212,11 @@ parse_config() ENTITY= fi - if [ -n "${VERIFY}" ]; then + if [ -n "${VERIFY}" ] && \ + [ -z "$NSS_DISABLE_LIBPKIX" ]; then verify_cert "-pp" - if [ -n "${VERIFY_CLASSIC_ENGINE_TOO}" ]; then + if [ -n "${VERIFY_CLASSIC_ENGINE_TOO}" ] && \ + [ -z "$NSS_DISABLE_LIBPKIX" ]; then verify_cert "" verify_cert "-p" fi diff --git a/tests/ssl/ssl.sh b/tests/ssl/ssl.sh index fa1000c43..8481c9db6 100755 --- a/tests/ssl/ssl.sh +++ b/tests/ssl/ssl.sh @@ -1068,7 +1068,9 @@ ssl_run() do case "${SSL_RUN}" in "stapling") - ssl_stapling + if [ -nz "$NSS_DISABLE_LIBPKIX" ]; then + ssl_stapling + fi ;; "signed_cert_timestamps") ssl_signed_cert_timestamps |