| Index: scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| diff --git a/scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| index dd707be5822bf9438181b3754b3e0ccea1714acf..b4db5d6e011639d4216f8bcc1ac73e1ca79e57e2 100644
|
| --- a/scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| +++ b/scripts/slave/recipes/skia/skia.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| @@ -7,7 +7,7 @@
|
| "origin",
|
| "https://skia.googlesource.com/skia.git"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git remote set-url"
|
| },
|
| {
|
| @@ -15,7 +15,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git fetch"
|
| },
|
| {
|
| @@ -25,7 +25,7 @@
|
| "--hard",
|
| "abc123"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git reset"
|
| },
|
| {
|
| @@ -35,7 +35,7 @@
|
| "-d",
|
| "-f"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git clean"
|
| },
|
| {
|
| @@ -45,9 +45,8 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| + "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -68,7 +67,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -89,11 +87,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
|
| + "[CWD]/skia/tools/buildbot_spec.py",
|
| "/path/to/tmp/json",
|
| "Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "exec buildbot_spec.py",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -137,11 +135,10 @@
|
| "-u",
|
| "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccache = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\nprint json.dumps({'ccache': ccache})\n"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "has ccache?",
|
| "stdout": "/path/to/tmp/json",
|
| @@ -165,54 +162,52 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",
|
| + "[CWD]/skia/platform_tools/android/bin/android_ninja",
|
| "nanobench",
|
| "-d",
|
| "arm_v7_neon",
|
| "--gcc"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "build nanobench"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device",
|
| + "[CWD]/skia/platform_tools/android/bin/adb_wait_for_device",
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "wait for device (1)"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge",
|
| + "[CWD]/skia/platform_tools/android/bin/adb_wait_for_charge",
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "wait for charge (1)"
|
| },
|
| @@ -225,11 +220,10 @@
|
| "echo",
|
| "$EXTERNAL_STORAGE"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "get EXTERNAL_STORAGE dir",
|
| "stdout": "/path/to/tmp/"
|
| @@ -241,11 +235,10 @@
|
| "015d210a13480604",
|
| "root"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "adb root"
|
| },
|
| @@ -254,63 +247,59 @@
|
| "sleep",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "wait"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device",
|
| + "[CWD]/skia/platform_tools/android/bin/adb_wait_for_device",
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "wait for device (2)"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge",
|
| + "[CWD]/skia/platform_tools/android/bin/adb_wait_for_charge",
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "wait for charge (2)"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia",
|
| + "[CWD]/skia/platform_tools/android/bin/android_kill_skia",
|
| "--verbose",
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "kill skia"
|
| },
|
| @@ -322,11 +311,10 @@
|
| "shell",
|
| "stop"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "stop shell"
|
| },
|
| @@ -339,31 +327,29 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "starting battery stats"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed",
|
| + "[CWD]/skia/platform_tools/android/bin/adb_push_if_needed",
|
| "--verbose",
|
| "-s",
|
| "015d210a13480604",
|
| - "[SLAVE_BUILD]/skia/resources",
|
| + "[CWD]/skia/resources",
|
| "/storage/emulated/legacy/skiabot/skia_resources"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "push resources"
|
| },
|
| @@ -372,10 +358,9 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[SLAVE_BUILD]/tmp",
|
| + "[CWD]/tmp",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -395,10 +380,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| + "[CWD]/tmp/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SKP_VERSION"
|
| },
|
| {
|
| @@ -406,10 +390,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/SKP_VERSION",
|
| + "[CWD]/skia/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SKP_VERSION"
|
| },
|
| {
|
| @@ -421,11 +404,10 @@
|
| "cat",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "read SKP_VERSION",
|
| "stdout": "/path/to/tmp/"
|
| @@ -435,10 +417,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| + "[CWD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -446,10 +427,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| + "[CWD]/skia/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -461,11 +441,10 @@
|
| "cat",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "read SK_IMAGE_VERSION",
|
| "stdout": "/path/to/tmp/"
|
| @@ -480,11 +459,10 @@
|
| "-r",
|
| "/storage/emulated/legacy/skiabot/skia_perf"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "rmdir skia_perf"
|
| },
|
| @@ -504,11 +482,10 @@
|
| "FILE_EXISTS;",
|
| "fi"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "exists skia_perf",
|
| "stdout": "/path/to/tmp/"
|
| @@ -523,11 +500,10 @@
|
| "-p",
|
| "/storage/emulated/legacy/skiabot/skia_perf"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "mkdir skia_perf"
|
| },
|
| @@ -539,13 +515,13 @@
|
| "--format=%at",
|
| "-s"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "git show",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia",
|
| + "[CWD]/skia/platform_tools/android/bin/android_run_skia",
|
| "--verbose",
|
| "--logcat",
|
| "-d",
|
| @@ -585,14 +561,13 @@
|
| "os",
|
| "Android"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "nanobench"
|
| },
|
| @@ -601,10 +576,9 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[SLAVE_BUILD]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data",
|
| + "[CWD]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs perf_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -621,21 +595,20 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed",
|
| + "[CWD]/skia/platform_tools/android/bin/adb_pull_if_needed",
|
| "--verbose",
|
| "-s",
|
| "015d210a13480604",
|
| "/storage/emulated/legacy/skiabot/skia_perf",
|
| - "[SLAVE_BUILD]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data"
|
| + "[CWD]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "pull skia_perf"
|
| },
|
| @@ -646,17 +619,17 @@
|
| "RECIPE_MODULE[build::skia]/resources/upload_bench_results.py",
|
| "Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release",
|
| "5",
|
| - "[SLAVE_BUILD]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data",
|
| + "[CWD]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data",
|
| "164710",
|
| - "[DEPOT_TOOLS]/third_party/gsutil/gsutil"
|
| + "[ROOT]/b/depot_tools/third_party/gsutil/gsutil"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
|
| "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "Upload nanobench Results"
|
| },
|
| @@ -669,11 +642,10 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "final battery stats"
|
| },
|
| @@ -684,11 +656,10 @@
|
| "015d210a13480604",
|
| "reboot"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "reboot"
|
| },
|
| @@ -697,45 +668,42 @@
|
| "sleep",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "wait for reboot"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device",
|
| + "[CWD]/skia/platform_tools/android/bin/adb_wait_for_device",
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "wait for device (3)"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge",
|
| + "[CWD]/skia/platform_tools/android/bin/adb_wait_for_charge",
|
| "-s",
|
| "015d210a13480604"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Release",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| + "SKIA_OUT": "[CWD]/skia/out/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release"
|
| },
|
| "name": "wait for charge (3)"
|
| },
|
|
|