| Index: scripts/slave/recipes/devtools.expected/devtools_fyi_with_devtools_file.json
|
| diff --git a/scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json b/scripts/slave/recipes/devtools.expected/devtools_fyi_with_devtools_file.json
|
| similarity index 73%
|
| copy from scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
|
| copy to scripts/slave/recipes/devtools.expected/devtools_fyi_with_devtools_file.json
|
| index b28e876b326ef773ffba2656a7bdbc1fc955b37a..458269375d25cb61037c43cb644c03a4211ccd3f 100644
|
| --- a/scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
|
| +++ b/scripts/slave/recipes/devtools.expected/devtools_fyi_with_devtools_file.json
|
| @@ -7,7 +7,7 @@
|
| "--master",
|
| "chromium.fyi",
|
| "--builder",
|
| - "ClangToTLinuxASanLibfuzzer",
|
| + "Chromium DevTools Linux",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -106,107 +106,138 @@
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "runhooks"
|
| + "git",
|
| + "diff",
|
| + "--cached",
|
| + "--name-only"
|
| ],
|
| "cwd": "[SLAVE_BUILD]/src",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",
|
| - "LLVM_FORCE_HEAD_REVISION": "YES",
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient runhooks"
|
| + "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",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| - "gen",
|
| - "-m",
|
| - "chromium.fyi",
|
| - "-b",
|
| - "ClangToTLinuxASanLibfuzzer",
|
| - "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| - "//out/Release"
|
| + "[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"
|
| - },
|
| - "name": "generate_build_files"
|
| + "name": "install node.js and npm"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| + "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": "git setup"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "retry",
|
| + "fetch",
|
| + "origin",
|
| + "master"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
|
| },
|
| - "name": "clang_revision",
|
| + "name": "git fetch"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "checkout",
|
| + "-f",
|
| + "FETCH_HEAD"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "name": "git checkout"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "rev-parse",
|
| + "HEAD"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/npm_modules",
|
| + "name": "read revision",
|
| + "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| + "@@@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",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| + "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
|
| + "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/node_modules"
|
| + ],
|
| + "name": "rmtree [SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/node_modules"
|
| + },
|
| + {
|
| + "cmd": [
|
| "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
|
| - "--gsutil-py-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| - "--ninja-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| - "--target",
|
| - "Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| - "--compiler",
|
| - "goma-clang",
|
| - "--goma-jsonstatus",
|
| - "/path/to/tmp/json",
|
| - "--goma-service-account-json-file",
|
| - "/creds/service_accounts/service-account-goma-client.json",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--",
|
| - "empty_fuzzer"
|
| + "-u",
|
| + "\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"
|
| ],
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| - },
|
| - "name": "compile",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| - "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| - ]
|
| + "name": "copy npm modules"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/out/Release/empty_fuzzer",
|
| - "-runs=1"
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools/scripts/buildbot/npm.py",
|
| + "run",
|
| + "lint"
|
| ],
|
| - "name": "running empty_fuzzer"
|
| + "cwd": "[SLAVE_BUILD]/src/third_party/WebKit/Source/devtools",
|
| + "name": "run eslint"
|
| },
|
| {
|
| "name": "$result",
|
|
|