Remove Nexus 6P expectations

Bot decommissioned in crrev.com/c/2541579 Bug: 1148989, 883500, 611945, 1002997, 1083320 Bug: 1056830, 663071 Change-Id: I56bf53efad8ac98fda8e9f91041677b5fa7ed88b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545093Reviewed-by: Brian Sheedy <bsheedy@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Cr-Commit-Position: refs/heads/master@{#828520}

Remove Nexus 6P expectations
Bot decommissioned in crrev.com/c/2541579 Bug: 1148989, 883500, 611945, 1002997, 1083320 Bug: 1056830, 663071 Change-Id: I56bf53efad8ac98fda8e9f91041677b5fa7ed88b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545093Reviewed-by: Brian Sheedy <bsheedy@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Cr-Commit-Position: refs/heads/master@{#828520}
2c7cd05e · Yuly Novikov · Commit Bot · 6fb0072d · 2c7cd05e · 2c7cd05e
Commit 2c7cd05e authored Nov 18, 2020 by Yuly Novikov Committed by Commit Bot Nov 18, 2020
15 changed files
--- a/content/test/gpu/gpu_tests/gpu_integration_test.py
+++ b/content/test/gpu/gpu_tests/gpu_integration_test.py
@@ -589,7 +589,6 @@ class GpuIntegrationTest(
        'qualcomm-adreno-(tm)-330',  # android-nexus-5
        'qualcomm-adreno-(tm)-418',  # android-nexus-5x
        'qualcomm-adreno-(tm)-420',  # android-nexus-6
-        'qualcomm-adreno-(tm)-430',  # android-nexus-6p
        'qualcomm-adreno-(tm)-540',  # android-pixel-2
        'nvidia-nvidia-tegra',  # android-nexus-9 and android-shield-android-tv
        'vmware',  # VMs

--- a/content/test/gpu/gpu_tests/maps_pixel_expectations.json
+++ b/content/test/gpu/gpu_tests/maps_pixel_expectations.json
@@ -14,10 +14,6 @@
        "device_type": "Nexus 6",
        "scale_factor": 1.47436
      },
-      {
-        "device_type": "Nexus 6P",
-        "scale_factor": 1.472
-      },
      {
        "device_type": "Nexus 9",
        "scale_factor": 1.566

--- a/content/test/gpu/gpu_tests/test_expectations/context_lost_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/context_lost_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/depth_capture_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/depth_capture_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/gpu_process_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/gpu_process_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/hardware_accelerated_feature_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/hardware_accelerated_feature_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/maps_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/maps_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform
@@ -201,10 +201,9 @@ crbug.com/868596 [ android android-chromium android-shield-android-tv ] Pixel_Of
 # float16 is not yet supported for accelerated canvases
 crbug.com/948141 Pixel_CanvasDisplaySRGBAccelerated2D [ Skip ]
-# Fails on Nexus 5, 6 and 6P
+# Fails on Nexus 5 and 6
 crbug.com/883500 [ android android-nexus-5 ] Pixel_BackgroundImage [ Skip ]
 crbug.com/883500 [ android android-nexus-6 ] Pixel_BackgroundImage [ Skip ]
-crbug.com/883500 [ android android-nexus-6p ] Pixel_BackgroundImage [ Skip ]
 crbug.com/1029389 [ android android-nexus-5 ] Pixel_PrecisionRoundedCorner [ Skip ]
 # Flakes on Nexus 5X.

--- a/content/test/gpu/gpu_tests/test_expectations/power_measurement_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/power_measurement_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/screenshot_sync_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/screenshot_sync_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform

--- a/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
@@ -9,8 +9,8 @@
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform
@@ -136,7 +136,6 @@ crbug.com/867718 [ win angle-d3d9 ] WebglExtension_EXT_disjoint_timer_query [ Sk
 [ android android-nexus-5x ] WebglExtension_WEBGL_depth_texture [ Skip ]
 [ android android-nexus-5x no-swiftshader-gl ] WebglExtension_EXT_sRGB [ Skip ]
 [ android android-nexus-6 no-swiftshader-gl ] WebglExtension_EXT_sRGB [ Skip ]
-[ android android-nexus-6p no-swiftshader-gl ] WebglExtension_EXT_sRGB [ Skip ]
 # Fuchsia specific
 [ fuchsia ] WebglExtension_EXT_shader_texture_lod [ Skip ]
@@ -679,20 +678,16 @@ crbug.com/1135785 [ android android-nexus-5x no-passthrough ] conformance/textur
 crbug.com/1099148 [ android android-nexus-5x ] deqp/data/gles2/shaders/swizzles.html [ Skip ]
 crbug.com/1122644 [ android android-nexus-5x ] conformance/textures/misc/texture-upload-size.html [ Skip ]
-# Nexus 6 (Adreno 420) and 6P (Adreno 430)
+# Nexus 6 (Adreno 420)
 crbug.com/499555 [ android android-nexus-6 ] conformance/context/context-attributes-alpha-depth-stencil-antialias.html [ Failure ]
 crbug.com/611945 [ android angle-disabled android-nexus-6 ] conformance/context/context-size-change.html [ Failure ]
 crbug.com/499555 [ android android-nexus-6 ] conformance/context/premultiplyalpha-test.html [ Failure ]
 crbug.com/611945 [ android android-nexus-6 ] conformance/glsl/bugs/gl-fragcoord-multisampling-bug.html [ Failure ]
 crbug.com/611945 [ android android-nexus-6 ] conformance/glsl/bugs/qualcomm-crash.html [ Failure ]
 crbug.com/611945 [ android-nexus-6 android ] conformance/glsl/bugs/sampler-struct-function-arg.html [ Failure ]
-crbug.com/611945 [ android-nexus-6p android ] conformance/glsl/bugs/sampler-struct-function-arg.html [ Failure ]
 crbug.com/951628 [ android android-nexus-6 no-passthrough no-swiftshader-gl ] conformance/rendering/blending.html [ Failure ]
-crbug.com/1002997 [ android android-nexus-6p no-passthrough no-swiftshader-gl ] conformance/rendering/blending.html [ Failure ]
 crbug.com/1083320 [ android android-nexus-6 ] conformance/misc/uninitialized-test.html [ Skip ]
 crbug.com/1056830 [ android android-nexus-6 ] conformance/extensions/webgl-compressed-texture-astc.html [ Failure ]
-crbug.com/1083320 [ android android-nexus-6p ] conformance/misc/uninitialized-test.html [ Skip ]
-crbug.com/1056830 [ android android-nexus-6p ] conformance/extensions/webgl-compressed-texture-astc.html [ Failure ]
 crbug.com/1122644 [ android android-nexus-6 ] conformance/textures/misc/texture-upload-size.html [ Skip ]
 crbug.com/1127140 [ android android-nexus-6 ] conformance/extensions/webgl-draw-buffers-framebuffer-unsupported.html [ Skip ]
@@ -714,7 +709,6 @@ crbug.com/499555 [ android android-nexus-6 ] conformance/rendering/gl-scissor-te
 crbug.com/611945 [ android android-nexus-6 ] conformance/rendering/gl-viewport-test.html [ Failure ]
 crbug.com/847222 [ android android-nexus-6 ] conformance/rendering/line-rendering-quality.html [ Failure ]
 crbug.com/499555 [ android android-nexus-6 no-passthrough ] conformance/textures/misc/copy-tex-image-and-sub-image-2d.html [ Failure ]
-crbug.com/663071 [ android android-nexus-6p ] conformance/uniforms/uniform-samplers-test.html [ Skip ]
 crbug.com/693135 [ android android-nexus-6 ] conformance/offscreencanvas/context-attribute-preserve-drawing-buffer.html [ Failure ]
 crbug.com/angleproject/5015 [ android android-nexus-6 ] conformance/glsl/misc/uninitialized-local-global-variables.html [ Failure ]

--- a/content/test/gpu/validate_tag_consistency.py
+++ b/content/test/gpu/validate_tag_consistency.py
@@ -20,8 +20,8 @@ TAG_HEADER = """\
 #             sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-9
-#             android-nexus-9 android-pixel-2 android-shield-android-tv
+#             android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-astro fuchsia-board-qemu-x64 ]
 # Platform