| Index: scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxAsanLibfuzzer.json
|
| diff --git a/scripts/slave/recipes/nacl/sdk.expected/basic.json b/scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxAsanLibfuzzer.json
|
| similarity index 90%
|
| copy from scripts/slave/recipes/nacl/sdk.expected/basic.json
|
| copy to scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxAsanLibfuzzer.json
|
| index 6d9942e7502a095ef5898ff37b0de844c332b7b8..59fa5a42795075444389aa13d5a7232d7e9acc3a 100644
|
| --- a/scripts/slave/recipes/nacl/sdk.expected/basic.json
|
| +++ b/scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxAsanLibfuzzer.json
|
| @@ -5,9 +5,9 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "chromium.testing.master",
|
| + "chromium.fyi",
|
| "--builder",
|
| - "TestBuilder",
|
| + "ClangToTLinuxAsanLibfuzzer",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -115,7 +115,7 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -127,13 +127,11 @@
|
| "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium.testing.master",
|
| + "chromium.fyi",
|
| "-b",
|
| - "TestBuilder",
|
| + "ClangToTLinuxAsanLibfuzzer",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]/src",
|
| @@ -143,15 +141,26 @@
|
| "name": "generate_build_files"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| + "--src-dir",
|
| + "[SLAVE_BUILD]/src",
|
| + "--output-json",
|
| + "/path/to/tmp/json"
|
| ],
|
| - "name": "cleanup_temp"
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| + "name": "clang_revision",
|
| + "~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@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -172,7 +181,7 @@
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--compiler",
|
| - "goma",
|
| + "goma-clang",
|
| "--goma-jsonstatus",
|
| "/path/to/tmp/json",
|
| "--goma-service-account-json-file",
|
| @@ -180,7 +189,7 @@
|
| "--goma-dir",
|
| "[BUILD]/goma",
|
| "--",
|
| - "chromium_builder_tests"
|
| + "empty_fuzzer"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| @@ -192,13 +201,11 @@
|
| ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/chromium/nacl_sdk_buildbot_run.py"
|
| + "[SLAVE_BUILD]/src/out/Release/empty_fuzzer",
|
| + "-runs=1"
|
| ],
|
| - "name": "annotated_steps"
|
| + "name": "running empty_fuzzer"
|
| },
|
| {
|
| "name": "$result",
|
|
|