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

Issues Search
    My Issues | Starred     Open | Closed | All

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
« scripts/slave/recipes/chromium.py ('K') | « 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') | Show Comments 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_chromiumos_Linux_ChromiumOS_Tests__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json
similarity index 76%
copy from scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Tests__1_.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json
index 73e4bb5142449e7d71b99a7fe287a1fa914b6d3c..c6d96c3971fad3ebeee68b3b57c96a261c4ae7aa 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Tests__1_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json
@@ -6,13 +6,13 @@
"-u",
"[BUILD]/scripts/slave/bot_update.py",
"--master",
- "chromium.chromiumos",
+ "chromium.linux",
"--builder",
- "Linux ChromiumOS Tests (1)",
+ "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",
@@ -33,7 +33,7 @@
"[DEPOT_TOOLS]/gclient.py",
"config",
"--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']"
],
"name": "gclient setup"
},
@@ -96,7 +96,8 @@
"runhooks"
],
"env": {
- "GYP_DEFINES": "chromeos=1 component=static_library ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1"
+ "GYP_CROSSCOMPILE": "1",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 target_arch=arm"
},
"name": "gclient runhooks"
},
@@ -105,12 +106,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.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.chromiumos.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -133,7 +134,8 @@
"name": "rmtree build directory",
"seed_steps": [
"rmtree build directory",
- "extract build"
+ "extract build",
+ "device_status_check"
],
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -154,14 +156,51 @@
"--target",
"Release",
"--build-url",
- "gs://chromium-chromiumos-archive/chromium.chromiumos/Linux ChromiumOS Builder/full-build-linux.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\": \"Linux ChromiumOS Tests (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"parent_buildername\": \"Linux ChromiumOS Builder\", \"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\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux ChromiumOS Tests (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"parent_buildername\": \"Linux ChromiumOS Builder\", \"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\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
],
"name": "extract build"
+ },
+ {
+ "abort_on_failure": true,
+ "cmd": [
+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py"
+ ],
+ "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/build/android/provision_devices.py",
+ "-t",
+ "Release"
+ ],
+ "name": "provision_devices"
+ },
+ {
+ "always_run": true,
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "gtest",
+ "-s",
+ "base_unittests"
+ ],
+ "env": {
+ "BUILDTYPE": "Release"
+ },
+ "name": "base_unittests"
}
]
« scripts/slave/recipes/chromium.py ('K') | « 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 »

Powered by Google App Engine
This is Rietveld 408576698