Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Side by Side Diff: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json

Issue 2200763002: Fix fake_specs.py, update recipe expectation (Closed) Base URL: https://skia.googlesource.com/skia.git@cleanup
Patch Set: More fixes Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « infra/bots/recipe_modules/core/fake_specs.py ('k') | tools/buildbot_spec.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os. path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", 6 "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os. path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
7 "[CUSTOM_/_B_WORK]", 7 "[CUSTOM_/_B_WORK]",
8 "511" 8 "511"
9 ], 9 ],
10 "name": "makedirs checkout_path", 10 "name": "makedirs checkout_path",
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", 94 "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@",
95 "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", 95 "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@",
96 "@@@STEP_LOG_LINE@json.output@ }, @@@", 96 "@@@STEP_LOG_LINE@json.output@ }, @@@",
97 "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", 97 "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
98 "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", 98 "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@",
99 "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", 99 "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
100 "@@@STEP_LOG_LINE@json.output@ ], @@@", 100 "@@@STEP_LOG_LINE@json.output@ ], @@@",
101 "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", 101 "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@",
102 "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", 102 "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@",
103 "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", 103 "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
104 "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", 104 "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@",
105 "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@",
106 "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1\"@@@",
105 "@@@STEP_LOG_LINE@json.output@ }, @@@", 107 "@@@STEP_LOG_LINE@json.output@ }, @@@",
106 "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", 108 "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
107 "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", 109 "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
108 "@@@STEP_LOG_LINE@json.output@ ], @@@", 110 "@@@STEP_LOG_LINE@json.output@ ], @@@",
109 "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", 111 "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@",
110 "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", 112 "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@",
111 "@@@STEP_LOG_LINE@json.output@}@@@", 113 "@@@STEP_LOG_LINE@json.output@}@@@",
112 "@@@STEP_LOG_END@json.output@@@" 114 "@@@STEP_LOG_END@json.output@@@"
113 ] 115 ]
114 }, 116 },
115 { 117 {
116 "cmd": [ 118 "cmd": [
117 "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" 119 "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
118 ], 120 ],
119 "cwd": "[CUSTOM_/_B_WORK]/skia", 121 "cwd": "[CUSTOM_/_B_WORK]/skia",
120 "env": { 122 "env": {
121 "BUILDTYPE": "Debug", 123 "BUILDTYPE": "Debug",
124 "CC": "/usr/bin/clang",
122 "CHROME_HEADLESS": "1", 125 "CHROME_HEADLESS": "1",
123 "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", 126 "CXX": "/usr/bin/clang++",
127 "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_ errors=1",
124 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]", 128 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]",
125 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN " 129 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN "
126 }, 130 },
127 "name": "fetch-gn" 131 "name": "fetch-gn"
128 }, 132 },
129 { 133 {
130 "cmd": [ 134 "cmd": [
131 "python", 135 "python",
132 "-u", 136 "-u",
133 "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccac he = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\npri nt json.dumps({'ccache': ccache})\n" 137 "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccac he = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\npri nt json.dumps({'ccache': ccache})\n"
134 ], 138 ],
135 "env": { 139 "env": {
136 "BUILDTYPE": "Debug", 140 "BUILDTYPE": "Debug",
141 "CC": "/usr/bin/clang",
137 "CHROME_HEADLESS": "1", 142 "CHROME_HEADLESS": "1",
138 "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", 143 "CXX": "/usr/bin/clang++",
144 "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_ errors=1",
139 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]", 145 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]",
140 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN " 146 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN "
141 }, 147 },
142 "name": "has ccache?", 148 "name": "has ccache?",
143 "stdout": "/path/to/tmp/json", 149 "stdout": "/path/to/tmp/json",
144 "~followup_annotations": [ 150 "~followup_annotations": [
145 "@@@STEP_LOG_LINE@json.output@{@@@", 151 "@@@STEP_LOG_LINE@json.output@{@@@",
146 "@@@STEP_LOG_LINE@json.output@ \"ccache\": \"/usr/bin/ccache\"@@@", 152 "@@@STEP_LOG_LINE@json.output@ \"ccache\": \"/usr/bin/ccache\"@@@",
147 "@@@STEP_LOG_LINE@json.output@}@@@", 153 "@@@STEP_LOG_LINE@json.output@}@@@",
148 "@@@STEP_LOG_END@json.output@@@", 154 "@@@STEP_LOG_END@json.output@@@",
(...skipping 13 matching lines...) Expand all
162 { 168 {
163 "cmd": [ 169 "cmd": [
164 "gn", 170 "gn",
165 "gen", 171 "gen",
166 "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug", 172 "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug",
167 "--args=is_debug=true cc=\"/usr/bin/ccache clang -Qunused-arguments\" cxx= \"/usr/bin/ccache clang++ -Qunused-arguments\"" 173 "--args=is_debug=true cc=\"/usr/bin/ccache clang -Qunused-arguments\" cxx= \"/usr/bin/ccache clang++ -Qunused-arguments\""
168 ], 174 ],
169 "cwd": "[CUSTOM_/_B_WORK]/skia", 175 "cwd": "[CUSTOM_/_B_WORK]/skia",
170 "env": { 176 "env": {
171 "BUILDTYPE": "Debug", 177 "BUILDTYPE": "Debug",
178 "CC": "/usr/bin/clang",
172 "CHROME_HEADLESS": "1", 179 "CHROME_HEADLESS": "1",
173 "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", 180 "CXX": "/usr/bin/clang++",
181 "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_ errors=1",
174 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]", 182 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]",
175 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN " 183 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN "
176 }, 184 },
177 "name": "gn_gen" 185 "name": "gn_gen"
178 }, 186 },
179 { 187 {
180 "cmd": [ 188 "cmd": [
181 "ninja", 189 "ninja",
182 "-C", 190 "-C",
183 "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug" 191 "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN/Debug"
184 ], 192 ],
185 "cwd": "[CUSTOM_/_B_WORK]/skia", 193 "cwd": "[CUSTOM_/_B_WORK]/skia",
186 "env": { 194 "env": {
187 "BUILDTYPE": "Debug", 195 "BUILDTYPE": "Debug",
196 "CC": "/usr/bin/clang",
188 "CHROME_HEADLESS": "1", 197 "CHROME_HEADLESS": "1",
189 "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", 198 "CXX": "/usr/bin/clang++",
199 "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_ errors=1",
190 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]", 200 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]",
191 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN " 201 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN "
192 }, 202 },
193 "name": "compile most" 203 "name": "compile most"
194 }, 204 },
195 { 205 {
196 "cmd": [ 206 "cmd": [
197 "python", 207 "python",
198 "-u", 208 "-u",
199 "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nan obench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so ', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.d ll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EE XIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.j oin(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\ n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", 209 "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nan obench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so ', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.d ll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EE XIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.j oin(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\ n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
(...skipping 28 matching lines...) Expand all
228 "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", 238 "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
229 "@@@STEP_LOG_END@python.inline@@@" 239 "@@@STEP_LOG_END@python.inline@@@"
230 ] 240 ]
231 }, 241 },
232 { 242 {
233 "name": "$result", 243 "name": "$result",
234 "recipe_result": null, 244 "recipe_result": null,
235 "status_code": 0 245 "status_code": 0
236 } 246 }
237 ] 247 ]
OLDNEW
« no previous file with comments | « infra/bots/recipe_modules/core/fake_specs.py ('k') | tools/buildbot_spec.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698