mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 880555 - Fix --test-manifest option for non mochitest-plain. r=jmaher
This commit is contained in:
parent
447f29004e
commit
00ec2e6c28
@ -236,6 +236,7 @@ function filterTests(filterFile, runOnly) {
|
||||
excludetests = filter;
|
||||
}
|
||||
|
||||
var testRoot = config.testRoot || "tests";
|
||||
// Start with gTestList, and put everything that's in 'runtests' in
|
||||
// filteredTests.
|
||||
if (Object.keys(runtests).length) {
|
||||
@ -247,8 +248,8 @@ function filterTests(filterFile, runOnly) {
|
||||
file = f.replace(/^\//, '')
|
||||
file = file.replace(/^tests\//, '')
|
||||
|
||||
// Match directory or filename, gTestList has tests/<path>
|
||||
if (tmp_path.match("^tests/" + file) != null) {
|
||||
// Match directory or filename, gTestList has <testroot>/<path>
|
||||
if (tmp_path.match(testRoot + "/" + file) != null) {
|
||||
filteredTests.push(test_path);
|
||||
break;
|
||||
}
|
||||
@ -272,8 +273,8 @@ function filterTests(filterFile, runOnly) {
|
||||
file = f.replace(/^\//, '')
|
||||
file = file.replace(/^tests\//, '')
|
||||
|
||||
// Match directory or filename, gTestList has tests/<path>
|
||||
if (tmp_path.match("^tests/" + file) != null) {
|
||||
// Match directory or filename, gTestList has <testroot>/<path>
|
||||
if (tmp_path.match(testRoot + "/" + file) != null) {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user