| Index: scripts/slave/recipes/devtools.expected/devtools_fyi_with_devtools_file.json
|
| diff --git a/scripts/slave/recipe_modules/emulator/example.expected/Disable_settings_after_launch_emulator_test_basic.json b/scripts/slave/recipes/devtools.expected/devtools_fyi_with_devtools_file.json
|
| similarity index 73%
|
| copy from scripts/slave/recipe_modules/emulator/example.expected/Disable_settings_after_launch_emulator_test_basic.json
|
| copy to scripts/slave/recipes/devtools.expected/devtools_fyi_with_devtools_file.json
|
| index c9be27b79a52687ddc47815d6922cd7d1d83db64..d5a30f7cf1682075e02125f3dcf83bbbe937c867 100644
|
| --- a/scripts/slave/recipe_modules/emulator/example.expected/Disable_settings_after_launch_emulator_test_basic.json
|
| +++ b/scripts/slave/recipes/devtools.expected/devtools_fyi_with_devtools_file.json
|
| @@ -7,11 +7,11 @@
|
| "--master",
|
| "chromium.fyi",
|
| "--builder",
|
| - "Disable settings after launch emulator",
|
| + "DevTools",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\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']",
|
| + "cache_dir = '[GIT_CACHE]'\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'}]",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| @@ -22,6 +22,7 @@
|
| "/path/to/tmp/json",
|
| "--revision",
|
| "src@HEAD",
|
| + "--force",
|
| "--output_manifest"
|
| ],
|
| "env": {
|
| @@ -105,118 +106,138 @@
|
| },
|
| {
|
| "cmd": [
|
| + "git",
|
| + "diff",
|
| + "--cached",
|
| + "--name-only"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| + "name": "git diff to analyze patch",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@files@third_party/WebKit/Source/devtools/fake.js@@@",
|
| + "@@@STEP_LOG_END@files@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "runhooks"
|
| + "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/scripts/buildbot/npm.py",
|
| + "--version"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=ia32 use_goma=1",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient runhooks"
|
| + "name": "install node.js and npm"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/install_emulator_deps.py",
|
| - "--api-level",
|
| - "23"
|
| + "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
|
| + "--path",
|
| + "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "--url",
|
| + "https://chromium.googlesource.com/deps/third_party/npm_modules"
|
| ],
|
| - "name": "[emulator] installing emulator deps"
|
| + "name": "git setup"
|
| },
|
| {
|
| "cmd": [
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
|
| - "--",
|
| - "[SLAVE_BUILD]/src/build/android/avd.py",
|
| - "run",
|
| - "--abi",
|
| - "x86",
|
| - "--api-level",
|
| - "23",
|
| - "--num",
|
| - "1",
|
| - "--headless",
|
| - "--enable-kvm",
|
| - "--partition-size",
|
| - "1024M",
|
| - "--sdcard-size",
|
| - "512M"
|
| + "git",
|
| + "retry",
|
| + "fetch",
|
| + "origin",
|
| + "master"
|
| ],
|
| - "name": "[emulator] spawn 1 emulator (abi x86, api_level 23)"
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "env": {
|
| + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
|
| + },
|
| + "name": "git fetch"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/avd.py",
|
| - "wait",
|
| - "-n",
|
| - "1"
|
| + "git",
|
| + "checkout",
|
| + "-f",
|
| + "FETCH_HEAD"
|
| ],
|
| - "name": "[emulator] wait for 1 emulators to complete booting"
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "name": "git checkout"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/provision_devices.py",
|
| - "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| - "--output-device-blacklist",
|
| - "/path/to/tmp/json",
|
| - "-t",
|
| - "Debug",
|
| - "--emulators"
|
| + "git",
|
| + "rev-parse",
|
| + "HEAD"
|
| ],
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "provision_devices"
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "name": "read revision",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "clean",
|
| + "-f",
|
| + "-d",
|
| + "-x"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "name": "git clean"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "submodule",
|
| + "sync"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "name": "submodule sync"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "submodule",
|
| + "update",
|
| + "--init",
|
| + "--recursive"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "name": "submodule update"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_sample_test",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| - "--verbose",
|
| - "--isolate_file_path=sample_isolate_file",
|
| - "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
|
| + "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/node_modules"
|
| ],
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "sample_test"
|
| + "name": "rmtree [SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/node_modules"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/avd.py",
|
| - "kill"
|
| + "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
|
| + "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules/devtools/node_modules",
|
| + "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/node_modules",
|
| + "0"
|
| ],
|
| - "name": "[emulator] killing all emulators"
|
| + "name": "copy npm modules"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/avd.py",
|
| - "delete"
|
| + "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/scripts/buildbot/npm.py",
|
| + "run",
|
| + "lint"
|
| ],
|
| - "name": "[emulator] deleting all temp avds after running"
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools",
|
| + "name": "run eslint"
|
| },
|
| {
|
| "name": "$result",
|
|
|