Bug 1468771 - fix reftest manifest parsing to support test cases with ? in the name. r=ahal

Reftest manifest parsing fails to recognize individual tests with ? in the name.  We missed this as in aou

Tes Plan:

Differential Revision: https://phabricator.services.mozilla.com/D1667
This commit is contained in:
Joel Maher 2018-06-18 13:46:27 +00:00
Родитель d85fda177c
Коммит 894c3e47af
2 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -667,9 +667,9 @@ function AddTestItem(aTest, aFilter) {
var globalFilter = aFilter[0]; var globalFilter = aFilter[0];
var manifestFilter = aFilter[1]; var manifestFilter = aFilter[1];
var invertManifest = aFilter[2]; var invertManifest = aFilter[2];
if ((globalFilter && !globalFilter.test(url1.spec)) || if (globalFilter && !globalFilter.test(url1.spec))
(manifestFilter && return;
!(invertManifest ^ manifestFilter.test(url1.spec)))) if (manifestFilter && !(invertManifest ^ manifestFilter.test(url1.spec)))
return; return;
if (g.focusFilterMode == FOCUS_FILTER_NEEDS_FOCUS_TESTS && if (g.focusFilterMode == FOCUS_FILTER_NEEDS_FOCUS_TESTS &&
!aTest.needsFocus) !aTest.needsFocus)

Просмотреть файл

@ -197,7 +197,7 @@ class ReftestResolver(object):
break break
if found: if found:
rv = [(os.path.join(dirname, default_manifest), rv = [(os.path.join(dirname, default_manifest),
r".*(?:/|\\)%s(?:[#?].*)?$" % pathname)] r".*(?:/|\\)%s(?:[#?].*)?$" % pathname.replace('?', '\?'))]
return rv return rv