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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json

Issue 1859993003: Fix dimensions for Skia iOS Swarming bots (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: OS Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/skia/swarm_compile.py ('k') | scripts/slave/recipes/skia/swarm_trigger.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
diff --git a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
similarity index 62%
copy from scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json
copy to scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
index 23ddf52b845123cb2ecc43306237ca407601f7c3..f52406fdac0d6d36426ac8edc8dce0f4d6f75826 100644
--- a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json
+++ b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
@@ -5,7 +5,7 @@
"-u",
"[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
- "Build-Ubuntu-GCC-Arm7-Release-Android"
+ "Build-Mac-Clang-Arm7-Release-iOS"
],
"cwd": "[SLAVE_BUILD]/skia",
"name": "exec buildbot_spec.py",
@@ -15,23 +15,24 @@
"@@@STEP_LOG_LINE@json.output@ \"most\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"iOS\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@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=arm 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=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
@@ -44,77 +45,19 @@
},
{
"cmd": [
- "python",
- "-u",
- "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccache = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\nprint json.dumps({'ccache': ccache})\n"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
- "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
- "SKIA_OUT": "[SLAVE_BUILD]/out"
- },
- "name": "has ccache?",
- "stdout": "/path/to/tmp/json",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"ccache\": null@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LOG_LINE@python.inline@import json@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ccache = None@@@",
- "@@@STEP_LOG_LINE@python.inline@try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ ccache = subprocess.check_output(['which', 'ccache']).rstrip()@@@",
- "@@@STEP_LOG_LINE@python.inline@except:@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@print json.dumps({'ccache': ccache})@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",
- "dm",
- "-d",
- "arm_v7_neon"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "env": {
- "ANDROID_HOME": "/b/android-sdk-linux",
- "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
- "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
- "SKIA_ANDROID_VERBOSE_SETUP": "1",
- "SKIA_OUT": "[SLAVE_BUILD]/out"
- },
- "name": "build dm"
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",
- "nanobench",
- "-d",
- "arm_v7_neon"
+ "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_ninja"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
- "ANDROID_HOME": "/b/android-sdk-linux",
- "ANDROID_SDK_ROOT": "/b/android-sdk-linux",
"BUILDTYPE": "Release",
+ "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
+ "CXX": "/usr/bin/clang++",
+ "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1",
"PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
- "SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
- "name": "build nanobench"
+ "name": "build iOSShell"
},
{
"cmd": [
« no previous file with comments | « scripts/slave/recipes/skia/swarm_compile.py ('k') | scripts/slave/recipes/skia/swarm_trigger.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698