Bug 1410911 - back out bug 1403322; r=gbrown

Backed out changesets 37db725b2308 ccc4f12edef0 e3a310b6b896 547109f6eb1d 5c50f100460d

MozReview-Commit-ID: 5M6Mevz6LZV

--HG--
extra : rebase_source : 038f10c09a6e1bcca1144a252b0c102496481349

js/moz.build

@@ -11,9 +11,3 @@ for header in ('GCAnnotations.h', 'GCAPI.h', 'HeapAPI.h', 'RootingAPI.h', 'Slice
 
 with Files('public/TrackedOptimizationInfo.h'):
     BUG_COMPONENT = component_jit
-
-with Files("src/**"):
-    SCHEDULES.inclusive += ['jittest', 'jsreftest']
-
-with Files("public/**"):
-    SCHEDULES.inclusive += ['jittest', 'jsreftest']

moz.build

@@ -55,18 +55,6 @@ with Files('**/Makefile.in'):
     BUG_COMPONENT = ('Core', 'Build Config')
     FINAL = True
 
-with Files("**/*.js"):
-    SCHEDULES.inclusive += ['test-verify']
-
-with Files("**/*.html"):
-    SCHEDULES.inclusive += ['test-verify']
-
-with Files("**/*.xhtml"):
-    SCHEDULES.inclusive += ['test-verify']
-
-with Files("**/*.xul"):
-    SCHEDULES.inclusive += ['test-verify']
-
 CONFIGURE_SUBST_FILES += [
     'config/autoconf.mk',
     'config/emptyvars.mk',

python/mozbuild/mozbuild/schedules.py

@@ -15,11 +15,6 @@ INCLUSIVE_COMPONENTS = [
     'py-lint',
     'js-lint',
     'yaml-lint',
-    # test suites that only run when certain files have changed
-    'jittest',
-    'test-verify',
-    # test flavors (narrower than suites)
-    'jsreftest',
 ]
 INCLUSIVE_COMPONENTS = sorted(INCLUSIVE_COMPONENTS)
 
@@ -35,6 +30,7 @@ EXCLUSIVE_COMPONENTS = [
     'firefox-ui',
     'geckoview',
     'gtest',
+    'jittest',
     'marionette',
     'mochitest',
     'reftest',

taskcluster/ci/test/compiled.yml

@@ -70,6 +70,10 @@ jittest:
             windows.*: false
             macosx.*: false
             default: true
+    when:
+        files-changed:
+            - js/src/**
+            - js/public/**
     tier:
         by-test-platform:
             windows10-64-asan.*: 3

taskcluster/ci/test/misc.yml

@@ -54,7 +54,7 @@ telemetry-tests-client:
 
 test-verify:
     description: "Extra verification of tests modified on this push"
-    suite: test-verify
+    suite: test-verification
     treeherder-symbol: tc(TV)
     loopback-video: true
     max-run-time: 5400
@@ -89,3 +89,9 @@ test-verify:
         no-read-buildbot-config: true
         extra-options:
             - --verify
+    when:
+        files-changed:
+            - '**/*.js'
+            - '**/*.html'
+            - '**/*.xhtml'
+            - '**/*.xul'

taskcluster/ci/test/reftest.yml

@@ -67,7 +67,9 @@ jsreftest:
             android.*: 7200
             default: 3600
     when:
-        schedules: ['jsreftest']
+        files-changed:
+            - js/src/**
+            - js/public/**
     tier:
         by-test-platform:
             linux64-qr/.*: 1

taskcluster/taskgraph/transforms/tests.py

@@ -366,11 +366,10 @@ test_description_schema = Schema({
     # the product name, defaults to firefox
     Optional('product'): basestring,
 
-    Optional('when'): {
-        # Run this test when the given SCHEDULES components have changed; the
-        # test suite and platform family are added to this list automatically.
-        Optional('schedules'): [basestring],
-    },
+    # conditional files to determine when these tests should be run
+    Optional('when'): Any({
+        Optional('files-changed'): [basestring],
+    }),
 
     Optional('worker-type'): optionally_keyed_by(
         'test-platform',
@@ -641,7 +640,7 @@ def handle_suite_category(config, tests):
 
         script = test['mozharness']['script']
         category_arg = None
-        if suite == 'test-verify':
+        if suite == 'test-verification':
             pass
         elif script == 'android_emulator_unittest.py':
             category_arg = '--test-suite'
@@ -976,16 +975,16 @@ def make_job_description(config, tests):
             'platform': test.get('treeherder-machine-platform', test['build-platform']),
         }
 
-        schedules = [attributes['unittest_suite'], platform_family(test['build-platform'])]
-        when = test.get('when')
-        if when and 'schedules' in when:
-            schedules.extend(when['schedules'])
-        if config.params['project'] != 'try':
-            # for non-try branches, include SETA
-            jobdesc['optimization'] = {'skip-unless-schedules-or-seta': schedules}
+        if test.get('when'):
+            jobdesc['when'] = test['when']
         else:
-            # otherwise just use skip-unless-schedules
-            jobdesc['optimization'] = {'skip-unless-schedules': schedules}
+            schedules = [attributes['unittest_suite'], platform_family(test['build-platform'])]
+            if config.params['project'] != 'try':
+                # for non-try branches, include SETA
+                jobdesc['optimization'] = {'skip-unless-schedules-or-seta': schedules}
+            else:
+                # otherwise just use skip-unless-schedules
+                jobdesc['optimization'] = {'skip-unless-schedules': schedules}
 
         run = jobdesc['run'] = {}
         run['using'] = 'mozharness-test'