Bug 1284832 - Remove memleak.sh test runs from Taskcluster CI r=franz…

…iskus
sailfishos-mirror · Jul 31, 2016 · 0ca68c5 · 0ca68c5
1 parent cd38b98
commit 0ca68c5
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 286 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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()