Backed out changeset 9573e2163ca4 (bug 1544041) for causing streams/*.any.js related bustages CLOSED TREE
authorBogdan Tara <btara@mozilla.com>
Mon, 15 Apr 2019 18:44:06 +0300
changeset 469519 d0ca7b557e0f5ac022ddc462b93378d0c60dbe01
parent 469518 85aec9a8e154758a7f6322df7b788ac8f484071a
child 469520 1ed5db9c200ac1057fbe77f5ca6e641ae4cfcfc5
push id112801
push userccoroiu@mozilla.com
push dateMon, 15 Apr 2019 21:40:09 +0000
treeherdermozilla-inbound@afb20612c0e5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1544041
milestone68.0a1
backs out9573e2163ca4009956027b6f2936871d8bb67586
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 9573e2163ca4 (bug 1544041) for causing streams/*.any.js related bustages CLOSED TREE
js/src/tests/jstests.py
js/src/tests/lib/results.py
--- a/js/src/tests/jstests.py
+++ b/js/src/tests/jstests.py
@@ -400,39 +400,27 @@ def load_wpt_tests(xul_tester, requested
     ]
 
     def resolve(test_path, script):
         if script.startswith("/"):
             return os.path.join(wpt, script[1:])
 
         return os.path.join(wpt, os.path.dirname(test_path), script)
 
-    tests = []
-    for test in loader.tests["testharness"]:
-        test_path = os.path.relpath(test.path, wpt)
-        scripts = [resolve(test_path, s) for s in test.scripts]
-        extra_helper_paths_for_test = extra_helper_paths + scripts,
-
-        # We must create at least one test with the default options, along with
-        # one test for each option given in a test-also annotation.
-        options = [None]
-        for m in test.itermeta():
-            if m.has_key("test-also"):  # NOQA: W601
-                options += m.get("test-also").split()
-        for option in options:
-            test_case = RefTestCase(
-                wpt,
-                test_path,
-                extra_helper_paths=extra_helper_paths_for_test[:],
-                wpt=test
-            )
-            if option:
-                test_case.options.append(option)
-            tests.append(test_case)
-    return tests
+    return [
+        RefTestCase(
+            wpt,
+            test_path,
+            extra_helper_paths=extra_helper_paths + [resolve(test_path, s) for s in test.scripts],
+            wpt=test
+        )
+        for test_path, test in (
+            (os.path.relpath(test.path, wpt), test) for test in loader.tests["testharness"]
+        )
+    ]
 
 
 def load_tests(options, requested_paths, excluded_paths):
     """
     Returns a tuple: (test_count, test_gen)
         test_count: [int] Number of tests that will be in test_gen
         test_gen: [iterable<Test>] Tests found that should be run.
     """
--- a/js/src/tests/lib/results.py
+++ b/js/src/tests/lib/results.py
@@ -362,17 +362,16 @@ class ResultsSink:
     def list(self, completed):
         for label, results in sorted(self.groups.items()):
             if label == '':
                 continue
 
             print(label)
             for result in results:
                 print('    {}'.format(' '.join(result.test.jitflags +
-                                               result.test.options +
                                                [result.test.path])))
 
         if self.options.failure_file:
             failure_file = open(self.options.failure_file, 'w')
             if not self.all_passed():
                 if 'REGRESSIONS' in self.groups:
                     for result in self.groups['REGRESSIONS']:
                         print(result.test.path, file=failure_file)