Bug 1132657 - Show JIT flags in jstests.py output. r=terrence

js/src/tests/jstests.py

@@ -271,8 +271,8 @@ def load_tests(options, requested_paths, excluded_paths):
         for test in test_list:
             for jitflags in flags_list:
                 tmp_test = copy(test)
-                tmp_test.options = copy(test.options)
-                tmp_test.options.extend(jitflags)
+                tmp_test.jitflags = copy(test.jitflags)
+                tmp_test.jitflags.extend(jitflags)
                 new_test_list.append(tmp_test)
         test_list = new_test_list
 

js/src/tests/lib/results.py

@@ -120,7 +120,7 @@ class ResultsSink:
         if isinstance(output, NullTestOutput):
             if self.options.tinderbox:
                 self.print_tinderbox_result(
-                    'TEST-KNOWN-FAIL', output.test.path, time=output.dt,
+                    'TEST-KNOWN-FAIL', output.test, time=output.dt,
                     skip=True)
             self.counts['SKIP'] += 1
             self.n += 1
@@ -130,7 +130,7 @@ class ResultsSink:
             dev_label = self.LABELS[tup][1]
             if output.timed_out:
                 dev_label = 'TIMEOUTS'
-            self.groups.setdefault(dev_label, []).append(result.test.path)
+            self.groups.setdefault(dev_label, []).append(result)
 
             if dev_label == 'REGRESSIONS':
                 show_output = self.options.show_output \
@@ -178,11 +178,11 @@ class ResultsSink:
                         if label == 'TEST-UNEXPECTED-PASS':
                             label = 'TEST-PASS (EXPECTED RANDOM)'
                         self.print_tinderbox_result(
-                            label, result.test.path, time=output.dt,
+                            label, result.test, time=output.dt,
                             message=msg)
                 tup = (result.result, result.test.expect, result.test.random)
                 self.print_tinderbox_result(
-                    self.LABELS[tup][0], result.test.path, time=output.dt)
+                    self.LABELS[tup][0], result.test, time=output.dt)
                 return
 
             if dev_label:
@@ -219,23 +219,24 @@ class ResultsSink:
         }
 
     def list(self, completed):
-        for label, paths in sorted(self.groups.items()):
+        for label, results in sorted(self.groups.items()):
             if label == '':
                 continue
 
             print(label)
-            for path in paths:
-                print('    {}'.format(path))
+            for result in results:
+                print('    {}'.format(' '.join(result.test.jitflags +
+                                               [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 path in self.groups['REGRESSIONS']:
-                        print(path, file=failure_file)
+                    for result in self.groups['REGRESSIONS']:
+                        print(result.test.path, file=failure_file)
                 if 'TIMEOUTS' in self.groups:
-                    for path in self.groups['TIMEOUTS']:
-                        print(path, file=failure_file)
+                    for result in self.groups['TIMEOUTS']:
+                        print(result.test.path, file=failure_file)
             failure_file.close()
 
         suffix = '' if completed else ' (partial run -- interrupted by user)'
@@ -247,11 +248,15 @@ class ResultsSink:
     def all_passed(self):
         return 'REGRESSIONS' not in self.groups and 'TIMEOUTS' not in self.groups
 
-    def print_tinderbox_result(self, label, path, message=None, skip=False,
+    def print_tinderbox_result(self, label, test, message=None, skip=False,
                                time=None):
         result = label
-        result += " | " + path
-        result += " |" + self.options.shell_args
+        result += " | " + test.path
+        args = []
+        if self.options.shell_args:
+            args.append(self.options.shell_args)
+        args += test.jitflags
+        result += ' | (args: "{}")'.format(' '.join(args))
         if message:
             result += " | " + message
         if skip:

js/src/tests/lib/tests.py

@@ -82,6 +82,7 @@ class Test(object):
     def __init__(self, path):
         self.path = path     # str:  path of JS file relative to tests root dir
         self.options = []    # [str]: Extra options to pass to the shell
+        self.jitflags = []   # [str]: JIT flags to pass to the shell
 
     @staticmethod
     def prefix_command(path):
@@ -95,8 +96,8 @@ class Test(object):
 
     def get_command(self, js_cmd_prefix):
         dirname, filename = os.path.split(self.path)
-        cmd = js_cmd_prefix + self.options + Test.prefix_command(dirname) \
-              + ['-f', self.path]
+        cmd = js_cmd_prefix + self.jitflags + self.options \
+              + Test.prefix_command(dirname) + ['-f', self.path]
         return cmd
 
     def run(self, js_cmd_prefix, timeout=30.0):