| Index: infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
|
| diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
|
| index f5152326ba4177a2bc736b2d276bd34c9f859c16..69d3ab58cc3426ba806e8de833facfd6152e090d 100644
|
| --- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
|
| +++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
|
| @@ -20,7 +20,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -35,7 +34,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -51,7 +49,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "get EXTERNAL_STORAGE dir",
|
| @@ -65,7 +62,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "adb root",
|
| @@ -79,7 +75,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "wait"
|
| @@ -93,7 +88,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -108,7 +102,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -124,7 +117,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -139,7 +131,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "stop shell"
|
| @@ -154,7 +145,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "starting battery stats"
|
| @@ -169,7 +159,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "cat scaling_governor"
|
| @@ -184,7 +173,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "cat cpu_freq"
|
| @@ -201,7 +189,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -237,7 +224,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "read SKP_VERSION",
|
| @@ -258,7 +244,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "rm SKP_VERSION"
|
| @@ -274,7 +259,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "rmdir skps"
|
| @@ -296,7 +280,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "exists skps",
|
| @@ -313,7 +296,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "mkdir skps"
|
| @@ -330,7 +312,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -346,7 +327,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "push SKP_VERSION"
|
| @@ -381,7 +361,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "read SK_IMAGE_VERSION",
|
| @@ -442,7 +421,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "rmdir skia_dm"
|
| @@ -464,7 +442,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "exists skia_dm",
|
| @@ -481,7 +458,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "mkdir skia_dm"
|
| @@ -519,7 +495,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "get uninteresting hashes",
|
| @@ -567,7 +542,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "push uninteresting_hashes.txt"
|
| @@ -924,7 +898,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -942,7 +915,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -958,7 +930,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "final battery stats"
|
| @@ -971,7 +942,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "reboot"
|
| @@ -984,7 +954,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "wait for reboot"
|
| @@ -998,7 +967,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -1013,7 +981,6 @@
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -1027,7 +994,6 @@
|
| "env": {
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| - "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| "name": "kill-server"
|
|
|