| Index: scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json b/scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json
|
| index a2bed4e9a42c155efac64ac609e41c44c78f8edb..7936844ef5780f3ae837b9e60f7badab956bbaa0 100644
|
| --- a/scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json
|
| +++ b/scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json
|
| @@ -55,7 +55,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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_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_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",
|
| @@ -105,7 +108,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| },
|
| @@ -122,7 +126,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| @@ -140,7 +145,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| },
|
| @@ -167,7 +173,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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",
|
| @@ -194,7 +201,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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",
|
| @@ -256,7 +264,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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_dm"
|
| @@ -279,7 +288,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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_dm",
|
| @@ -297,7 +307,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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_dm"
|
| @@ -336,7 +347,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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 uninteresting hashes",
|
| @@ -385,7 +397,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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": "push uninteresting_hashes.txt"
|
| @@ -445,7 +458,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| },
|
| @@ -464,7 +478,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| },
|
| @@ -481,7 +496,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| @@ -495,7 +511,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| @@ -509,7 +526,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| @@ -524,7 +542,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| },
|
| @@ -540,7 +559,8 @@
|
| "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "GYP_DEFINES": "skia_arch_type=arm 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"
|
| },
|
|
|