diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2016-09-16 13:42:56 -0700 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2016-09-16 13:42:56 -0700 |
| commit | 6c214486e9ef0f7b8653dea24689e5491de959b6 (patch) | |
| tree | 7d4d3f1347d05853217823b9b9710268e4193081 /automation | |
| parent | 6efedbcb0d51f696cdb7a5d44f781e69e3ca5802 (diff) | |
| download | nss-hg-6c214486e9ef0f7b8653dea24689e5491de959b6.tar.gz | |
Bug 1303224 - Remove the PKCS#11 bypass r=franziskus,mt
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/taskcluster/graph/src/extend.js | 14 | ||||
| -rwxr-xr-x | automation/taskcluster/scripts/run_scan_build.sh | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js index 8c6c230c7..5827468e5 100644 --- a/automation/taskcluster/graph/src/extend.js +++ b/automation/taskcluster/graph/src/extend.js @@ -209,12 +209,6 @@ async function scheduleLinux(name, base) { })); queue.scheduleTask(merge(extra_base, { - name: `${name} w/ NSS_NO_PKCS11_BYPASS=1`, - env: {NSS_NO_PKCS11_BYPASS: "1"}, - symbol: "noPkcs11Bypass" - })); - - queue.scheduleTask(merge(extra_base, { name: `${name} w/ NSS_DISABLE_LIBPKIX=1`, env: {NSS_DISABLE_LIBPKIX: "1"}, symbol: "noLibpkix" @@ -279,14 +273,6 @@ async function scheduleWindows(name, base) { ] })); - // Extra builds. - let extra_base = merge({group: "Builds"}, build_base); - queue.scheduleTask(merge(extra_base, { - name: `${name} w/ NSS_NO_PKCS11_BYPASS=1`, - env: {NSS_NO_PKCS11_BYPASS: "1"}, - symbol: "noPkcs11Bypass" - })); - return queue.submit(); } diff --git a/automation/taskcluster/scripts/run_scan_build.sh b/automation/taskcluster/scripts/run_scan_build.sh index 25b133d88..95382c8e4 100755 --- a/automation/taskcluster/scripts/run_scan_build.sh +++ b/automation/taskcluster/scripts/run_scan_build.sh @@ -23,7 +23,7 @@ cd nss && make nss_build_all # we run scan-build on these folders declare -a scan=("lib/ssl" "lib/freebl") # corresponds to the number of errors that are expected in the |scan| folder -declare -a ignore=(1 0) +declare -a ignore=(0 0) for i in "${scan[@]}" do |