Fix fake_specs.py, update recipe expectation

BUG=skia:5578
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2200763002

Review-Url: https://codereview.chromium.org/2200763002

3 files changed, 47 insertions, 34 deletions

diff --git a/infra/bots/gen_buildbot_specs.py b/infra/bots/gen_buildbot_specs.py
index d960ab217b..6a2a91a623 100755
--- a/infra/bots/gen_buildbot_specs.py
+++ b/infra/bots/gen_buildbot_specs.py
@@ -153,7 +153,7 @@ def main():
     os.remove(tmp_spec_file.name)
 
   out = os.path.join(
-      SKIA_DIR, 'infra', 'bots', 'recipe_modules', 'skia', 'fake_specs.py')
+      SKIA_DIR, 'infra', 'bots', 'recipe_modules', 'core', 'fake_specs.py')
 
   with open(out, 'w') as f:
     f.write('''# Copyright 2016 The Chromium Authors. All rights reserved.
diff --git a/infra/bots/recipe_modules/core/fake_specs.py b/infra/bots/recipe_modules/core/fake_specs.py
index 4b922b52e7..5041ca9beb 100644
--- a/infra/bots/recipe_modules/core/fake_specs.py
+++ b/infra/bots/recipe_modules/core/fake_specs.py
@@ -162,6 +162,37 @@ FAKE_SPECS = {
     'upload_dm_results': True,
     'upload_perf_results': False,
   },
+  'Build-Ubuntu-Clang-x86_64-Debug-GN': {
+    'build_targets': [
+      'most',
+    ],
+    'builder_cfg': {
+      'compiler': 'Clang',
+      'configuration': 'Debug',
+      'extra_config': 'GN',
+      'is_trybot': False,
+      'os': 'Ubuntu',
+      'role': 'Build',
+      'target_arch': 'x86_64',
+    },
+    'configuration': 'Debug',
+    'dm_flags': [
+      '--dummy-flags',
+    ],
+    'do_perf_steps': False,
+    'do_test_steps': False,
+    'env': {
+      'CC': '/usr/bin/clang',
+      'CXX': '/usr/bin/clang++',
+      'GYP_DEFINES':
+          'skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1',
+    },
+    'nanobench_flags': [
+      '--dummy-flags',
+    ],
+    'upload_dm_results': True,
+    'upload_perf_results': False,
+  },
   'Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan': {
     'build_targets': [
       'most',
@@ -332,34 +363,6 @@ FAKE_SPECS = {
     'upload_dm_results': True,
     'upload_perf_results': False,
   },
-  'Build-Ubuntu-Clang-x86_64-Debug-GN': {
-    'build_targets': [
-      'most',
-    ],
-    'builder_cfg': {
-      'compiler': 'Clang',
-      'configuration': 'Debug',
-      'extra_config': 'GN',
-      'is_trybot': False,
-      'os': 'Ubuntu',
-      'role': 'Build',
-      'target_arch': 'x86_64',
-    },
-    'configuration': 'Debug',
-    'dm_flags': [
-      '--dummy-flags',
-    ],
-    'do_perf_steps': False,
-    'do_test_steps': False,
-    'env': {
-      'GYP_DEFINES': 'skia_arch_type=x86_64 skia_warnings_as_errors=1',
-    },
-    'nanobench_flags': [
-      '--dummy-flags',
-    ],
-    'upload_dm_results': True,
-    'upload_perf_results': False,
-  },
   'Build-Ubuntu-GCC-x86_64-Debug-GN': {
     'build_targets': [
       'most',
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json
index 1658b3b3eb..fd6b94f37f 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json
@@ -101,7 +101,9 @@
       "@@@STEP_LOG_LINE@json.output@  \"do_perf_steps\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"do_test_steps\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"env\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"CC\": \"/usr/bin/clang\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"CXX\": \"/usr/bin/clang++\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"nanobench_flags\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"--dummy-flags\"@@@",
@@ -119,8 +121,10 @@
     "cwd": "[CUSTOM_/_B_WORK]/skia",
     "env": {
       "BUILDTYPE": "Debug",
+      "CC": "/usr/bin/clang",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
+      "CXX": "/usr/bin/clang++",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
     },
@@ -134,8 +138,10 @@
     ],
     "env": {
       "BUILDTYPE": "Debug",
+      "CC": "/usr/bin/clang",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
+      "CXX": "/usr/bin/clang++",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
     },
@@ -169,8 +175,10 @@
     "cwd": "[CUSTOM_/_B_WORK]/skia",
     "env": {
       "BUILDTYPE": "Debug",
+      "CC": "/usr/bin/clang",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
+      "CXX": "/usr/bin/clang++",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
     },
@@ -185,8 +193,10 @@
     "cwd": "[CUSTOM_/_B_WORK]/skia",
     "env": {
       "BUILDTYPE": "Debug",
+      "CC": "/usr/bin/clang",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
+      "CXX": "/usr/bin/clang++",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
       "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
     },