| Index: scripts/slave/recipes/skia/skia.expected/missing_SKP_VERSION_device.json
|
| diff --git a/scripts/slave/recipes/skia/skia.expected/missing_SKP_VERSION_device.json b/scripts/slave/recipes/skia/skia.expected/missing_SKP_VERSION_device.json
|
| index de4762ea93d11d7f8514382748000c7f528076f3..8e84854caf3ebb1ef7573556ed7a854096bd0ec8 100644
|
| --- a/scripts/slave/recipes/skia/skia.expected/missing_SKP_VERSION_device.json
|
| +++ b/scripts/slave/recipes/skia/skia.expected/missing_SKP_VERSION_device.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",
|
| "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "exec buildbot_spec.py",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -138,11 +136,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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "has ccache?",
|
| "stdout": "/path/to/tmp/json",
|
| @@ -166,73 +163,71 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",
|
| + "[CWD]/skia/platform_tools/android/bin/android_ninja",
|
| "dm",
|
| "-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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "build dm"
|
| },
|
| {
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "wait for charge (1)"
|
| },
|
| @@ -245,11 +240,10 @@
|
| "echo",
|
| "$EXTERNAL_STORAGE"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "get EXTERNAL_STORAGE dir",
|
| "stdout": "/path/to/tmp/"
|
| @@ -261,11 +255,10 @@
|
| "015d210a13480604",
|
| "root"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "adb root"
|
| },
|
| @@ -274,63 +267,59 @@
|
| "sleep",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "kill skia"
|
| },
|
| @@ -342,11 +331,10 @@
|
| "shell",
|
| "stop"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "stop shell"
|
| },
|
| @@ -359,31 +347,29 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "push resources"
|
| },
|
| @@ -392,10 +378,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@@@@",
|
| @@ -415,10 +400,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"
|
| },
|
| {
|
| @@ -426,10 +410,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"
|
| },
|
| {
|
| @@ -441,11 +424,10 @@
|
| "cat",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "read SKP_VERSION",
|
| "stdout": "/path/to/tmp/",
|
| @@ -464,11 +446,10 @@
|
| "-f",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "rm SKP_VERSION"
|
| },
|
| @@ -482,11 +463,10 @@
|
| "-r",
|
| "/storage/emulated/legacy/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "rmdir skps"
|
| },
|
| @@ -506,11 +486,10 @@
|
| "FILE_EXISTS;",
|
| "fi"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "exists skps",
|
| "stdout": "/path/to/tmp/"
|
| @@ -525,31 +504,29 @@
|
| "-p",
|
| "/storage/emulated/legacy/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "mkdir skps"
|
| },
|
| {
|
| "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]/playback/skps",
|
| + "[CWD]/playback/skps",
|
| "/storage/emulated/legacy/skiabot/skia_skp/skps"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "push skps"
|
| },
|
| @@ -559,14 +536,13 @@
|
| "-s",
|
| "015d210a13480604",
|
| "push",
|
| - "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| + "[CWD]/tmp/SKP_VERSION",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "push SKP_VERSION"
|
| },
|
| @@ -575,10 +551,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"
|
| },
|
| {
|
| @@ -586,10 +561,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"
|
| },
|
| {
|
| @@ -601,11 +575,10 @@
|
| "cat",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "read SK_IMAGE_VERSION",
|
| "stdout": "/path/to/tmp/"
|
| @@ -615,9 +588,8 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[SLAVE_BUILD]/dm"
|
| + "[CWD]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -635,10 +607,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]/dm",
|
| + "[CWD]/dm",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs dm",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -663,11 +634,10 @@
|
| "-r",
|
| "/storage/emulated/legacy/skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "rmdir skia_dm"
|
| },
|
| @@ -687,11 +657,10 @@
|
| "FILE_EXISTS;",
|
| "fi"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "exists skia_dm",
|
| "stdout": "/path/to/tmp/"
|
| @@ -706,11 +675,10 @@
|
| "-p",
|
| "/storage/emulated/legacy/skiabot/skia_dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "mkdir skia_dm"
|
| },
|
| @@ -719,13 +687,13 @@
|
| "python",
|
| "-u",
|
| "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
|
| - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt"
|
| + "[CWD]/tmp/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "get uninteresting hashes",
|
| "~followup_annotations": [
|
| @@ -768,20 +736,19 @@
|
| "-s",
|
| "015d210a13480604",
|
| "push",
|
| - "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
|
| + "[CWD]/tmp/uninteresting_hashes.txt",
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "push uninteresting_hashes.txt"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia",
|
| + "[CWD]/skia/platform_tools/android/bin/android_run_skia",
|
| "--verbose",
|
| "--logcat",
|
| "-d",
|
| @@ -830,34 +797,32 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "dm"
|
| },
|
| {
|
| "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_dm",
|
| - "[SLAVE_BUILD]/dm"
|
| + "[CWD]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "pull skia_dm"
|
| },
|
| @@ -866,26 +831,26 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
|
| - "[SLAVE_BUILD]/dm",
|
| + "[CWD]/dm",
|
| "164710",
|
| "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug",
|
| "6",
|
| "",
|
| - "[SLAVE_BUILD]/skia/common/py/utils"
|
| + "[CWD]/skia/common/py/utils"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
|
| "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto",
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "Upload DM Results"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia",
|
| + "[CWD]/skia/platform_tools/android/bin/android_run_skia",
|
| "--verbose",
|
| "--logcat",
|
| "-d",
|
| @@ -905,14 +870,13 @@
|
| "--nocpu",
|
| "--dummy-flags"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",
|
| "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "nanobench"
|
| },
|
| @@ -925,11 +889,10 @@
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "final battery stats"
|
| },
|
| @@ -940,11 +903,10 @@
|
| "015d210a13480604",
|
| "reboot"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "reboot"
|
| },
|
| @@ -953,45 +915,42 @@
|
| "sleep",
|
| "10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "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": "Debug",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| + "SKIA_OUT": "[CWD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
|
| },
|
| "name": "wait for charge (3)"
|
| },
|
|
|