scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json - Issue 303513002: Initial work towards public Android recipes

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json

Issue 303513002: Initial work towards public Android recipes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: rebase Created 6 years, 7 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/chromium.expected/full_chromium_linux_Android_Builder__dbg_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json

diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_win_NaCl_Tests__x86_32_.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json

similarity index 75%

copy from scripts/slave/recipes/chromium.expected/full_chromium_win_NaCl_Tests__x86_32_.json

copy to scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json

index d54acda2ed779d3b7e2eaa1831f4a110435c75b2..8a771ba354f5982b3fccd80ac84031b46c9c95d9 100644

--- a/scripts/slave/recipes/chromium.expected/full_chromium_win_NaCl_Tests__x86_32_.json

+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json

@@ -1,26 +1,18 @@

[

{

- "cmd": [

- "python",

- "-u",

- "[BUILD]\\scripts\\slave\\kill_processes.py"

- ],

- "name": "taskkill"

- },

- {

"abort_on_failure": true,

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\bot_update.py",

+ "[BUILD]/scripts/slave/bot_update.py",

"--master",

- "chromium.win",

+ "chromium.linux",

"--builder",

- "NaCl Tests (x86-32)",

+ "Android Tests",

"--slave",

"TestSlavename",

"--spec",

- "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",

+ "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",

"--revision_mapping_file",

"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarm_client\": \"got_swarm_client_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",

"--output_json",

@@ -40,10 +32,10 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS]\\gclient.py",

+ "[DEPOT_TOOLS]/gclient.py",

"config",

"--spec",

"name": "gclient setup"

@@ -52,7 +44,7 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS]\\gclient.py",

+ "[DEPOT_TOOLS]/gclient.py",

"sync",

"--nohooks",

"--delete_unversioned_trees",

@@ -104,13 +96,26 @@

"cmd": [

"python",

"-u",

+ "[DEPOT_TOOLS]/gclient.py",

+ "runhooks"

+ ],

+ "env": {

+ "GYP_CROSSCOMPILE": "1",

+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 target_arch=arm"

+ },

+ "name": "gclient runhooks"

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",

+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",

"/path/to/tmp/json"

"name": "read test spec",

"~followup_annotations": [

- "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",

+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",

"@@@STEP_LOG_LINE@json.output@{}@@@",

"@@@STEP_LOG_END@json.output@@@"

]

@@ -119,7 +124,7 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\cleanup_temp.py"

+ "[BUILD]/scripts/slave/cleanup_temp.py"

"name": "cleanup_temp"

@@ -128,15 +133,13 @@

"python",

"-u",

"\nimport os, sys\nfrom common import chromium_utils\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",

- "[SLAVE_BUILD]\\src\\out\\Release"

+ "[SLAVE_BUILD]/src/out/Release"

"name": "rmtree build directory",

"seed_steps": [

"rmtree build directory",

"extract build",

- "start_crash_service",

- "nacl_integration",

- "process_dumps"

+ "device_status_check"

"~followup_annotations": [

"@@@STEP_LOG_LINE@python.inline@@@@",

@@ -153,49 +156,55 @@

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\extract_build.py",

+ "[BUILD]/scripts/slave/extract_build.py",

"--target",

"Release",

"--build-url",

- "gs://chromium-win-archive/chromium.win/Win Builder/full-build-win32.zip",

+ "gs://chromium-linux-archive/chromium.linux/Android Builder/full-build-linux.zip",

"--build_revision",

"170242",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"NaCl Tests (x86-32)\", \"buildnumber\": 571, \"mastername\": \"chromium.win\", \"parent_buildername\": \"Win Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"name": "extract build"

{

+ "abort_on_failure": true,

"cmd": [

- "python",

- "-u",

- "[BUILD]\\scripts\\slave\\chromium\\run_crash_handler.py",

- "--target",

- "Release"

+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py"

- "name": "start_crash_service"

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "device_status_check"

{

+ "abort_on_failure": true,

+ "can_fail_build": false,

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]\\src\\chrome\\test\\nacl_test_injection\\buildbot_nacl_integration.py",

- "--mode",

+ "[SLAVE_BUILD]/src/build/android/provision_devices.py",

+ "-t",

"Release"

- "name": "nacl_integration"

+ "name": "provision_devices"

{

"always_run": true,

"cmd": [

"python",

"-u",

- "[BUILD]\\scripts\\slave\\process_dumps.py",

- "--target",

- "Release"

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "gtest",

+ "-s",

+ "base_unittests"

- "name": "process_dumps"

+ "env": {

+ "BUILDTYPE": "Release"

+ },

+ "name": "base_unittests"

}

]