Bug 1579836 - Execute NSPR tests as part of NSS continuous integration. r=jcj
authorKai Engert <kaie@kuix.de>
Fri, 08 Nov 2019 09:14:53 +0100
changeset 15381 46bfbabf7e756fc0208817bf61e424fcb98e0643
parent 15380 67d630e7cb7cbf943408f9e238d41839028bcfee
child 15382 e766899c72a517976f5f4abfec2a56712841e411
push id3574
push userkaie@kuix.de
push dateFri, 08 Nov 2019 08:15:00 +0000
reviewersjcj
bugs1579836
Bug 1579836 - Execute NSPR tests as part of NSS continuous integration. r=jcj
automation/taskcluster/graph/src/extend.js
--- a/automation/taskcluster/graph/src/extend.js
+++ b/automation/taskcluster/graph/src/extend.js
@@ -349,18 +349,17 @@ async function scheduleMac(name, base, a
 
   let gyp_cmd = "nss/automation/taskcluster/scripts/build_gyp.sh ";
 
   if (!("collection" in base) ||
       (base.collection != "make" &&
        base.collection != "asan" &&
        base.collection != "fips" &&
        base.collection != "fuzz")) {
-    let nspr_gyp = gyp_cmd + "--nspr-only --nspr-test-build ";
-    // TODO (bug 1385039): nspr_gyp += "--nspr-test-run ";
+    let nspr_gyp = gyp_cmd + "--nspr-only --nspr-test-build --nspr-test-run ";
     let nspr_build = merge(build_base_without_command_symbol, {
       command: [
         MAC_CHECKOUT_CMD,
         ["bash", "-c",
          nspr_gyp + args]
       ],
       symbol: "NSPR"
     });
@@ -419,18 +418,17 @@ async function scheduleLinux(name, overr
     kind: "build",
   };
 
   if (!("collection" in overrides) ||
        (overrides.collection != "make" &&
         overrides.collection != "asan" &&
         overrides.collection != "fips" &&
         overrides.collection != "fuzz")) {
-    let nspr_gyp = checkout_and_gyp + "--nspr-only --nspr-test-build ";
-    // TODO (bug 1385039): nspr_gyp += "--nspr-test-run ";
+    let nspr_gyp = checkout_and_gyp + "--nspr-only --nspr-test-build --nspr-test-run ";
 
     let nspr_base = merge({
       command: [
         "/bin/bash",
         "-c",
         nspr_gyp + args
       ],
     }, overrides);
@@ -863,18 +861,17 @@ async function scheduleWindows(name, bas
   });
 
   if (!("collection" in base) ||
       (base.collection != "make" &&
        base.collection != "asan" &&
        base.collection != "fips" &&
        base.collection != "fuzz")) {
     let nspr_gyp =
-      `bash -c 'nss/automation/taskcluster/windows/${build_script} --nspr-only --nspr-test-build'`;
-      // TODO (bug 1385039): add --nspr-test-run
+      `bash -c 'nss/automation/taskcluster/windows/${build_script} --nspr-only --nspr-test-build --nspr-test-run'`;
     let nspr_build = merge(build_without_command_symbol, {
       command: [
         WINDOWS_CHECKOUT_CMD,
         nspr_gyp
       ],
       symbol: "NSPR"
     });
     // The task that tests NSPR.