| Index: scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| index 8417c15901d0fa31871d96135312db925c49c29c..a8adb85025f0075c0c3f821de5af3e95e408e274 100644
|
| --- a/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| +++ b/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| @@ -55,7 +55,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -71,7 +72,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -88,7 +90,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "get EXTERNAL_STORAGE dir",
|
| @@ -103,7 +106,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "adb root"
|
| @@ -117,7 +121,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "wait"
|
| @@ -132,7 +137,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -148,7 +154,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -165,7 +172,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -181,7 +189,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "stop shell"
|
| @@ -197,7 +206,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "starting battery stats"
|
| @@ -215,7 +225,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -242,7 +253,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "read SKP_VERSION",
|
| @@ -269,7 +281,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "read SK_IMAGE_VERSION",
|
| @@ -287,7 +300,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "rmdir skia_perf"
|
| @@ -310,7 +324,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "exists skia_perf",
|
| @@ -328,7 +343,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "mkdir skia_perf"
|
| @@ -379,7 +395,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -420,7 +437,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -437,7 +455,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "final battery stats"
|
| @@ -451,7 +470,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "reboot"
|
| @@ -465,7 +485,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "wait for reboot"
|
| @@ -480,7 +501,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -496,7 +518,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
|
| - "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
|
| + "PATH": "[DEPOT_TOOLS]:%(PATH)s",
|
| + "PYTHONPATH": "[BUILD]/scripts",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
|
|