diff options
-rw-r--r-- | .taskcluster.yml | 3 | ||||
-rw-r--r-- | automation/taskcluster/docker/setup.sh | 1 | ||||
-rw-r--r-- | automation/taskcluster/graph/linux/_build_base.yml | 2 | ||||
-rw-r--r-- | automation/taskcluster/graph/linux/_test_base.yml | 2 | ||||
-rw-r--r-- | automation/taskcluster/graph/linux/build64-asan.yml | 2 | ||||
-rw-r--r-- | automation/taskcluster/graph/linux/build64-debug.yml | 1 | ||||
-rw-r--r-- | automation/taskcluster/graph/linux/build64-lsan.yml | 38 | ||||
-rw-r--r-- | automation/taskcluster/graph/tests/crmf.yml | 1 | ||||
-rw-r--r-- | automation/taskcluster/graph/tests/fips.yml | 1 | ||||
-rw-r--r-- | automation/taskcluster/graph/tests/memleak.yml | 228 | ||||
-rw-r--r-- | automation/taskcluster/graph/tools/_build_base.yml | 2 | ||||
-rw-r--r-- | automation/taskcluster/graph/try_syntax.js | 11 | ||||
-rw-r--r-- | tests/common/init.sh | 6 |
13 files changed, 12 insertions, 286 deletions
diff --git a/.taskcluster.yml b/.taskcluster.yml index d510fddcf..6efc9f9ef 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -57,13 +57,14 @@ tasks: - "tc-treeherder.v2.{{project}}.{{revision}}.{{pushlog_id}}" payload: - image: "ttaubert/nss-ci:0.0.18" + image: "ttaubert/nss-ci:0.0.19" env: TC_OWNER: {{owner}} TC_SOURCE: {{{source}}} TC_PROJECT: {{project}} TC_COMMENT: '{{comment}}' + TC_IMAGE: "ttaubert/nss-ci:0.0.19" NSS_PUSHLOG_ID: '{{pushlog_id}}' NSS_HEAD_REPOSITORY: '{{{url}}}' NSS_HEAD_REVISION: '{{revision}}' diff --git a/automation/taskcluster/docker/setup.sh b/automation/taskcluster/docker/setup.sh index 789f30b59..da619b505 100644 --- a/automation/taskcluster/docker/setup.sh +++ b/automation/taskcluster/docker/setup.sh @@ -9,7 +9,6 @@ apt_packages+=('curl') apt_packages+=('mercurial') apt_packages+=('npm') apt_packages+=('git') -apt_packages+=('valgrind') apt_packages+=('zlib1g-dev') # 32-bit builds diff --git a/automation/taskcluster/graph/linux/_build_base.yml b/automation/taskcluster/graph/linux/_build_base.yml index 669528d3f..9495032a9 100644 --- a/automation/taskcluster/graph/linux/_build_base.yml +++ b/automation/taskcluster/graph/linux/_build_base.yml @@ -14,7 +14,7 @@ task: payload: maxRunTime: 3600 - image: ttaubert/nss-ci:0.0.18 + image: !env TC_IMAGE artifacts: public: diff --git a/automation/taskcluster/graph/linux/_test_base.yml b/automation/taskcluster/graph/linux/_test_base.yml index 4e3857c05..96ff87c42 100644 --- a/automation/taskcluster/graph/linux/_test_base.yml +++ b/automation/taskcluster/graph/linux/_test_base.yml @@ -14,7 +14,7 @@ task: payload: maxRunTime: 3600 - image: ttaubert/nss-ci:0.0.18 + image: !env TC_IMAGE command: - "/bin/bash" diff --git a/automation/taskcluster/graph/linux/build64-asan.yml b/automation/taskcluster/graph/linux/build64-asan.yml index 7529ad64b..983f5c6a9 100644 --- a/automation/taskcluster/graph/linux/build64-asan.yml +++ b/automation/taskcluster/graph/linux/build64-asan.yml @@ -8,6 +8,8 @@ env: GCC_VERSION: clang GXX_VERSION: clang++ + NSS_DISABLE_ARENA_FREE_LIST: 1 + NSS_DISABLE_UNLOAD: 1 NSS_ENABLE_TLS_1_3: 1 USE_ASAN: 1 USE_64: 1 diff --git a/automation/taskcluster/graph/linux/build64-debug.yml b/automation/taskcluster/graph/linux/build64-debug.yml index 03a93fb15..3339b834c 100644 --- a/automation/taskcluster/graph/linux/build64-debug.yml +++ b/automation/taskcluster/graph/linux/build64-debug.yml @@ -27,7 +27,6 @@ - fips - gtests - lowhash - - memleak - merge - sdr - smime diff --git a/automation/taskcluster/graph/linux/build64-lsan.yml b/automation/taskcluster/graph/linux/build64-lsan.yml deleted file mode 100644 index 75747c870..000000000 --- a/automation/taskcluster/graph/linux/build64-lsan.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- task: - metadata: - name: "Linux 64 (LSan, debug)" - description: "Linux 64 (LSan, debug)" - - payload: - env: - GCC_VERSION: clang - GXX_VERSION: clang++ - NSS_DISABLE_ARENA_FREE_LIST: 1 - NSS_DISABLE_UNLOAD: 1 - NSS_ENABLE_TLS_1_3: 1 - NSS_ENABLE_LSAN: 1 - USE_ASAN: 1 - USE_64: 1 - - extra: - treeherder: - build: - platform: linux64 - machine: - platform: linux64 - collection: - lsan: true - - tests: - - chains - - cipher - - db - - ec - - gtests - - lowhash - - merge - - sdr - - smime - - ssl - - tools diff --git a/automation/taskcluster/graph/tests/crmf.yml b/automation/taskcluster/graph/tests/crmf.yml index eff4a611b..a29a9c5e2 100644 --- a/automation/taskcluster/graph/tests/crmf.yml +++ b/automation/taskcluster/graph/tests/crmf.yml @@ -6,6 +6,7 @@ payload: env: + ASAN_OPTIONS: detect_leaks=0 NSS_TESTS: crmf extra: diff --git a/automation/taskcluster/graph/tests/fips.yml b/automation/taskcluster/graph/tests/fips.yml index d25a3ea54..58484c7b2 100644 --- a/automation/taskcluster/graph/tests/fips.yml +++ b/automation/taskcluster/graph/tests/fips.yml @@ -6,6 +6,7 @@ payload: env: + ASAN_OPTIONS: detect_leaks=0 NSS_TESTS: fips extra: diff --git a/automation/taskcluster/graph/tests/memleak.yml b/automation/taskcluster/graph/tests/memleak.yml deleted file mode 100644 index 9b0dd64ca..000000000 --- a/automation/taskcluster/graph/tests/memleak.yml +++ /dev/null @@ -1,228 +0,0 @@ ---- -- task: - metadata: - name: "MemLeak tests (ssl_server, standard)" - description: "MemLeak tests (ssl_server, standard)" - - payload: - env: - NSS_MEMLEAK_TESTS: ssl_server - NSS_CYCLES: standard - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Server - groupName: MemLeak tests (ssl_server) - symbol: standard - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (ssl_server, pkix)" - description: "MemLeak tests (ssl_server, pkix)" - - payload: - env: - NSS_MEMLEAK_TESTS: ssl_server - NSS_CYCLES: pkix - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Server - groupName: MemLeak tests (ssl_server) - symbol: pkix - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (ssl_server, sharedb)" - description: "MemLeak tests (ssl_server, sharedb)" - - payload: - env: - NSS_MEMLEAK_TESTS: ssl_server - NSS_CYCLES: sharedb - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Server - groupName: MemLeak tests (ssl_server) - symbol: sharedb - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (ssl_server, upgradedb)" - description: "MemLeak tests (ssl_server, upgradedb)" - - payload: - env: - NSS_MEMLEAK_TESTS: ssl_server - NSS_CYCLES: upgradedb - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Server - groupName: MemLeak tests (ssl_server) - symbol: upgradedb - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (ssl_client, standard)" - description: "MemLeak tests (ssl_client, standard)" - - payload: - env: - NSS_MEMLEAK_TESTS: ssl_client - NSS_CYCLES: standard - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Client - groupName: MemLeak tests (ssl_client) - symbol: standard - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (ssl_client, pkix)" - description: "MemLeak tests (ssl_client, pkix)" - - payload: - env: - NSS_MEMLEAK_TESTS: ssl_client - NSS_TESTS: memleak - NSS_CYCLES: pkix - - extra: - treeherder: - groupSymbol: Client - groupName: MemLeak tests (ssl_client) - symbol: pkix - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (ssl_client, sharedb)" - description: "MemLeak tests (ssl_client, sharedb)" - - payload: - env: - NSS_MEMLEAK_TESTS: ssl_client - NSS_CYCLES: sharedb - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Client - groupName: MemLeak tests (ssl_client) - symbol: sharedb - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (ssl_client, upgradedb)" - description: "MemLeak tests (ssl_client, upgradedb)" - - payload: - env: - NSS_MEMLEAK_TESTS: ssl_client - NSS_CYCLES: upgradedb - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Client - groupName: MemLeak tests (ssl_client) - symbol: upgradedb - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (chains, standard)" - description: "MemLeak tests (chains, standard)" - - payload: - env: - NSS_MEMLEAK_TESTS: chains - NSS_CYCLES: standard - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Chains - groupName: MemLeak tests (chains) - symbol: standard - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (chains, pkix)" - description: "MemLeak tests (chains, pkix)" - - payload: - env: - NSS_MEMLEAK_TESTS: chains - NSS_TESTS: memleak - NSS_CYCLES: pkix - - extra: - treeherder: - groupSymbol: Chains - groupName: MemLeak tests (chains) - symbol: pkix - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (chains, sharedb)" - description: "MemLeak tests (chains, sharedb)" - - payload: - env: - NSS_MEMLEAK_TESTS: chains - NSS_CYCLES: sharedb - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Chains - groupName: MemLeak tests (chains) - symbol: sharedb - collection: - memleak: true - -- task: - metadata: - name: "MemLeak tests (chains, upgradedb)" - description: "MemLeak tests (chains, upgradedb)" - - payload: - env: - NSS_MEMLEAK_TESTS: chains - NSS_CYCLES: upgradedb - NSS_TESTS: memleak - - extra: - treeherder: - groupSymbol: Chains - groupName: MemLeak tests (chains) - symbol: upgradedb - collection: - memleak: true diff --git a/automation/taskcluster/graph/tools/_build_base.yml b/automation/taskcluster/graph/tools/_build_base.yml index e32766d47..9190700a9 100644 --- a/automation/taskcluster/graph/tools/_build_base.yml +++ b/automation/taskcluster/graph/tools/_build_base.yml @@ -14,7 +14,7 @@ task: payload: maxRunTime: 3600 - image: ttaubert/nss-ci:0.0.18 + image: !env TC_IMAGE env: NSS_HEAD_REPOSITORY: !env NSS_HEAD_REPOSITORY diff --git a/automation/taskcluster/graph/try_syntax.js b/automation/taskcluster/graph/try_syntax.js index 397009c66..704a9e015 100644 --- a/automation/taskcluster/graph/try_syntax.js +++ b/automation/taskcluster/graph/try_syntax.js @@ -79,11 +79,6 @@ function filterTasks(tasks, comment) { var coll = th.collection || {}; var found; - // Never include memleak builds, they'll go away soon. - if (coll.memleak) { - return false; - } - // Filter tools. We can immediately return here as those // are not affected by platform or build type selectors. if (machine == "nss-tools") { @@ -114,9 +109,9 @@ function filterTasks(tasks, comment) { // Check the platform name. var keep = machine == (aliases[platform] || platform); - // Additional check for LSan. + // Additional check for ASan. if (platform == "linux64-asan") { - keep &= coll.asan || coll.lsan; + keep &= coll.asan; } return keep; @@ -127,7 +122,7 @@ function filterTasks(tasks, comment) { } // Finally, filter by build type. - var isDebug = coll.debug || coll.asan || coll.lsan; + var isDebug = coll.debug || coll.asan; return (isDebug && opts.builds.indexOf("d") > -1) || (!isDebug && opts.builds.indexOf("o") > -1); }); diff --git a/tests/common/init.sh b/tests/common/init.sh index 88f44e524..457890dc2 100644 --- a/tests/common/init.sh +++ b/tests/common/init.sh @@ -44,12 +44,6 @@ NSS_STRICT_SHUTDOWN=1 export NSS_STRICT_SHUTDOWN -# If using ASan, disable LSan; see bug 1246801. -if [ -z "${NSS_ENABLE_LSAN}" ]; then - ASAN_OPTIONS="detect_leaks=0${ASAN_OPTIONS:+:$ASAN_OPTIONS}" - export ASAN_OPTIONS -fi - # Init directories based on HOSTDIR variable if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then init_directories() |