summaryrefslogtreecommitdiffstats
path: root/security/nss/automation/taskcluster/graph/src/try_syntax.js
diff options
context:
space:
mode:
Diffstat (limited to 'security/nss/automation/taskcluster/graph/src/try_syntax.js')
-rw-r--r--security/nss/automation/taskcluster/graph/src/try_syntax.js40
1 files changed, 22 insertions, 18 deletions
diff --git a/security/nss/automation/taskcluster/graph/src/try_syntax.js b/security/nss/automation/taskcluster/graph/src/try_syntax.js
index 695c9e92f..7748e068a 100644
--- a/security/nss/automation/taskcluster/graph/src/try_syntax.js
+++ b/security/nss/automation/taskcluster/graph/src/try_syntax.js
@@ -22,8 +22,10 @@ function parseOptions(opts) {
}
// Parse platforms.
- let allPlatforms = ["linux", "linux64", "linux64-asan", "win64", "arm",
- "linux64-gyp", "linux64-gyp-asan", "linux64-fuzz"];
+ let allPlatforms = ["linux", "linux64", "linux64-asan",
+ "win", "win64", "win-make", "win64-make",
+ "linux64-make", "linux-make", "linux-fuzz",
+ "linux64-fuzz", "aarch64"];
let platforms = intersect(opts.platform.split(/\s*,\s*/), allPlatforms);
// If the given value is nonsense or "none" default to all platforms.
@@ -34,7 +36,7 @@ function parseOptions(opts) {
// Parse unit tests.
let aliases = {"gtests": "gtest"};
let allUnitTests = ["bogo", "crmf", "chains", "cipher", "db", "ec", "fips",
- "gtest", "lowhash", "merge", "sdr", "smime", "tools",
+ "gtest", "interop", "lowhash", "merge", "sdr", "smime", "tools",
"ssl", "mpi", "scert", "spki"];
let unittests = intersect(opts.unittests.split(/\s*,\s*/).map(t => {
return aliases[t] || t;
@@ -82,11 +84,13 @@ function filter(opts) {
// Filter unit tests.
if (task.tests) {
let found = opts.unittests.some(test => {
- // TODO: think of something more intelligent here.
- if (task.symbol.toLowerCase().startsWith("mpi") && test == "mpi") {
+ if (task.group && task.group.toLowerCase() == "ssl" && test == "ssl") {
return true;
}
- return (task.group || task.symbol).toLowerCase().startsWith(test);
+ if (task.group && task.group.toLowerCase() == "cipher" && test == "cipher") {
+ return true;
+ }
+ return task.symbol.toLowerCase().startsWith(test);
});
if (!found) {
@@ -105,12 +109,15 @@ function filter(opts) {
let found = opts.platforms.some(platform => {
let aliases = {
"linux": "linux32",
+ "linux-fuzz": "linux32",
"linux64-asan": "linux64",
"linux64-fuzz": "linux64",
- "linux64-gyp": "linux64",
- "linux64-gyp-asan": "linux64",
+ "linux64-make": "linux64",
+ "linux-make": "linux32",
+ "win64-make": "windows2012-64",
+ "win-make": "windows2012-32",
"win64": "windows2012-64",
- "arm": "linux32"
+ "win": "windows2012-32"
};
// Check the platform name.
@@ -119,13 +126,10 @@ function filter(opts) {
// Additional checks.
if (platform == "linux64-asan") {
keep &= coll("asan");
- } else if (platform == "arm") {
- keep &= coll("arm-opt") || coll("arm-debug");
- } else if (platform == "linux64-gyp") {
- keep &= coll("gyp");
- } else if (platform == "linux64-gyp-asan") {
- keep &= coll("gyp-asan");
- } else if (platform == "linux64-fuzz") {
+ } else if (platform == "linux64-make" || platform == "linux-make" ||
+ platform == "win64-make" || platform == "win-make") {
+ keep &= coll("make");
+ } else if (platform == "linux64-fuzz" || platform == "linux-fuzz") {
keep &= coll("fuzz");
} else {
keep &= coll("opt") || coll("debug");
@@ -139,8 +143,8 @@ function filter(opts) {
}
// Finally, filter by build type.
- let isDebug = coll("debug") || coll("asan") || coll("arm-debug") ||
- coll("gyp") || coll("fuzz");
+ let isDebug = coll("debug") || coll("asan") || coll("make") ||
+ coll("fuzz");
return (isDebug && opts.builds.includes("d")) ||
(!isDebug && opts.builds.includes("o"));
}