Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json

Issue 2209423002: [recipes] Remove build environment vars from default_env (Closed) Base URL: https://skia.googlesource.com/skia.git@merge_buildbot_spec_fix_coverage
Patch Set: [recipes] Remove build environment vars from default_env Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
diff --git a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
index c6128469e57e1ffea6b81010d8e4d3f36bcbd73e..2eeb7bf6c9910501b59264acdcc5c39f6ede5b30 100644
--- a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
+++ b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_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",
@@ -273,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": "read SK_IMAGE_VERSION",
@@ -294,7 +279,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 SK_IMAGE_VERSION"
@@ -310,7 +294,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_images"
@@ -332,7 +315,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_images",
@@ -349,7 +331,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_images"
@@ -366,7 +347,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"
},
@@ -382,7 +362,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 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"

Powered by Google App Engine
This is Rietveld 408576698