| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Linux_ARM_Cross_Compile.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Clang__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Linux_ARM_Cross_Compile.json
|
| similarity index 90%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Clang__dbg_.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Linux_ARM_Cross_Compile.json
|
| index 5d96c2497663faa2c0f3ef9d76066204f45dffc4..04330b83813b50a5b046650c4d56674fb4387e3f 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Linux_Clang__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Linux_ARM_Cross_Compile.json
|
| @@ -6,9 +6,9 @@
|
| "-u",
|
| "[BUILD]/scripts/slave/bot_update.py",
|
| "--master",
|
| - "chromium.linux",
|
| + "chromium.fyi",
|
| "--builder",
|
| - "Linux Clang (dbg)",
|
| + "Linux ARM Cross-Compile",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -68,7 +68,14 @@
|
| "runhooks"
|
| ],
|
| "env": {
|
| - "GYP_DEFINES": "clang=1 component=shared_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
|
| + "AR": "arm-linux-gnueabihf-ar",
|
| + "AS": "arm-linux-gnueabihf-as",
|
| + "CC": "arm-linux-gnueabihf-gcc",
|
| + "CC_host": "gcc",
|
| + "CXX": "arm-linux-gnueabihf-g++",
|
| + "CXX_host": "g++",
|
| + "GYP_DEFINES": "arm_float_abi=hard component=static_library target_arch=arm test_isolation_mode=archive",
|
| + "RANLIB": "arm-linux-gnueabihf-ranlib"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -77,11 +84,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium_arm.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium_arm.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -101,15 +109,11 @@
|
| "-u",
|
| "[BUILD]/scripts/slave/compile.py",
|
| "--target",
|
| - "Debug",
|
| + "Release",
|
| "--src-dir",
|
| "[SLAVE_BUILD]/src",
|
| "--build-tool",
|
| "ninja",
|
| - "--compiler",
|
| - "goma-clang",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| "--",
|
| "all"
|
| ],
|
|
|