scripts/slave/recipes/gpu/build_and_upload.expected/linux_debug.json - Issue 137993010: Added support for properly building and running isolates in recipes.

Unified Diff: scripts/slave/recipes/gpu/build_and_upload.expected/linux_debug.json

Issue 137993010: Added support for properly building and running isolates in recipes. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Added missed files. Created 6 years, 11 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/gpu/build_and_upload.py ('k') | scripts/slave/recipes/gpu/build_and_upload.expected/linux_release.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/gpu/build_and_upload.expected/linux_debug.json

diff --git a/scripts/slave/recipes/gpu/build_and_upload.expected/linux_release.json b/scripts/slave/recipes/gpu/build_and_upload.expected/linux_debug.json

similarity index 84%

copy from scripts/slave/recipes/gpu/build_and_upload.expected/linux_release.json

copy to scripts/slave/recipes/gpu/build_and_upload.expected/linux_debug.json

index a6d14336745ed72e9a3b4477a0171b9326ab4a62..7aa8c8cb3c20b46482a78626a87ef69c61cff5d0 100644

--- a/scripts/slave/recipes/gpu/build_and_upload.expected/linux_release.json

+++ b/scripts/slave/recipes/gpu/build_and_upload.expected/linux_debug.json

@@ -81,7 +81,7 @@

"runhooks"

"env": {

- "GYP_DEFINES": "component=static_library disable_glibcxx_debug=1 internal_gles2_conform_tests=1 target_arch=x64",

+ "GYP_DEFINES": "component=shared_library disable_glibcxx_debug=1 internal_gles2_conform_tests=1 target_arch=x64",

"GYP_GENERATORS": "ninja"

"name": "gclient runhooks"

@@ -93,7 +93,7 @@

"-u",

"[BUILD]/scripts/slave/compile.py",

"--target",

- "Release",

+ "Debug",

"--build-dir",

"[SLAVE_BUILD]/src/out",

"--src-dir",

@@ -103,7 +103,7 @@

"--compiler",

"goma",

"--",

- "chromium_gpu_builder",

+ "chromium_gpu_debug_builder",

"gl_tests_run"

"name": "compile"

@@ -114,7 +114,7 @@

"-u",

"[BUILD]/scripts/slave/swarming/manifest_to_hash.py",

"--target",

- "Release",

+ "Debug",

"--output-json",

"/path/to/tmp/json",

"gl_tests"

@@ -134,15 +134,15 @@

"-u",

"[BUILD]/scripts/slave/zip_build.py",

"--target",

- "Release",

+ "Debug",

"--build-dir",

"[SLAVE_BUILD]/src/out",

"--build-url",

- "gs://chromium-gpu-archive/chromium.gpu.testing/linux builder",

+ "gs://chromium-gpu-archive/chromium.gpu.testing/linux debug builder",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Release\", \"buildername\": \"linux builder\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.testing\", \"project\": \"\", \"recipe\": \"gpu/build_and_upload\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"TestBranch\", \"build_config\": \"Debug\", \"buildername\": \"linux debug builder\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu.testing\", \"project\": \"\", \"recipe\": \"gpu/build_and_upload\", \"repository\": \"svn://svn-mirror.golo.chromium.org/chrome/trunk\", \"revision\": \"204787\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"name": "package_build"

}