Index: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json |
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json |
similarity index 91% |
copy from infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json |
copy to infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json |
index 6a507c98fcbfe8aadc58d12348283891854450d5..0bf3675700657f258350da961f2d3a61c50828f8 100644 |
--- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json |
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json |
@@ -76,7 +76,7 @@ |
"-u", |
"[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", |
"/path/to/tmp/json", |
- "Build-Ubuntu-GCC-x86_64-Release-Shared" |
+ "Build-Ubuntu-GCC-x86-Debug" |
], |
"cwd": "[CUSTOM_/_B_WORK]/skia", |
"name": "exec buildbot_spec.py", |
@@ -87,21 +87,20 @@ |
"@@@STEP_LOG_LINE@json.output@ ], @@@", |
"@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Shared\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", |
"@@@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=x86_64 skia_shared_lib=1 skia_warnings_as_errors=1\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86 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,12 +118,12 @@ |
], |
"cwd": "[CUSTOM_/_B_WORK]/skia", |
"env": { |
- "BUILDTYPE": "Release", |
+ "BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
"CHROME_PATH": "[SLAVE_BUILD]/src", |
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_shared_lib=1 skia_warnings_as_errors=1", |
+ "GYP_DEFINES": "skia_arch_type=x86 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-GCC-x86_64-Release-Shared" |
+ "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" |
}, |
"name": "build most" |
}, |
@@ -133,8 +132,8 @@ |
"python", |
"-u", |
"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', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(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", |
- "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared/Release", |
- "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" |
+ "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug/Debug", |
+ "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug" |
], |
"name": "copy build products", |
"~followup_annotations": [ |