Run test spec update as part of codegen.

infra/specs/generate_test_spec_json.py

@@ -3,6 +3,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Script to generate the test spec JSON files. Calls Chromium's generate_buildbot_json.
+
+=== NOTE: DO NOT RUN THIS SCRIPT DIRECTLY. ===
+Run scripts/run_code_generation.py instead to update necessary hashes.
+
 """
 
 import os
@@ -12,8 +16,8 @@ import subprocess
 
 d = os.path.dirname
 THIS_DIR = d(os.path.abspath(__file__))
-TESTING_DIR = os.path.join(d(d(THIS_DIR)), 'testing', 'buildbot')
-sys.path.insert(0, TESTING_DIR)
+TESTING_BBOT_DIR = os.path.join(d(d(THIS_DIR)), 'testing', 'buildbot')
+sys.path.insert(0, TESTING_BBOT_DIR)
 
 import generate_buildbot_json
 
@@ -39,7 +43,25 @@ MIXINS_PYL_TEMPLATE = """\
 {mixin_data}
 """
 
-if __name__ == '__main__':  # pragma: no cover
+
+def main():
+    if len(sys.argv) > 1:
+        gen_bb_json = os.path.join(TESTING_BBOT_DIR, 'generate_buildbot_json.py')
+        mixins_pyl = os.path.join(TESTING_BBOT_DIR, 'mixins.pyl')
+        inputs = [
+            'test_suite_exceptions.pyl', 'test_suites.pyl', 'variants.pyl', 'waterfalls.pyl',
+            gen_bb_json, mixins_pyl
+        ]
+        outputs = ['angle.json', 'mixins.pyl']
+        if sys.argv[1] == 'inputs':
+            print(','.join(inputs))
+        elif sys.argv[1] == 'outputs':
+            print(','.join(outputs))
+        else:
+            print('Invalid script parameters')
+            return 1
+        return 0
+
     chromium_args = generate_buildbot_json.BBJSONGenerator.parse_args(sys.argv[1:])
     chromium_generator = generate_buildbot_json.BBJSONGenerator(chromium_args)
     chromium_generator.load_configuration_files()
@@ -85,4 +107,8 @@ if __name__ == '__main__':  # pragma: no cover
         f.write(generated_mixin_pyl)
         f.close()
 
-    sys.exit(angle_generator.main())
+    return angle_generator.main()
+
+
+if __name__ == '__main__':  # pragma: no cover
+    sys.exit(main())

scripts/code_generation_hashes/Test_spec_JSON.json

+{
+  "infra/specs/angle.json":
+    "0726b06598519056f8a5c8734f0ece69",
+  "infra/specs/generate_test_spec_json.py":
+    "e1c8a771f751adad715d7bea900fc8e1",
+  "infra/specs/mixins.pyl":
+    "9e823fc9ff27db9fc49eae7ac1615ab6",
+  "infra/specs/test_suite_exceptions.pyl":
+    "aad1a4aed801277cc531733deab221b5",
+  "infra/specs/test_suites.pyl":
+    "75d1ccce3ffded215b002dc0bab41773",
+  "infra/specs/variants.pyl":
+    "8cfcaa99fa07ad2a2d5d14f220fd5037",
+  "infra/specs/waterfalls.pyl":
+    "2c37af604e70b11d1d1c5a7d48394a46",
+  "testing/buildbot/generate_buildbot_json.py":
+    "c04d166b1cee26a4db52c1b1613c8462",
+  "testing/buildbot/mixins.pyl":
+    "740f76768734c647dac0e1fa1c16835d"
+}
\ No newline at end of file

scripts/run_code_generation.py

@@ -129,6 +129,8 @@ generators = {
         'src/common/spirv/gen_spirv_builder_and_parser.py',
     'Static builtins':
         'src/compiler/translator/gen_builtin_symbols.py',
+    'Test spec JSON':
+        'infra/specs/generate_test_spec_json.py',
     'uniform type':
         'src/common/gen_uniform_type_table.py',
     'Vulkan format':