Clean up additional GPU tags

Adds/ignores some additional tags that were found being produced by GPU
tests.

Bug: 1111876, 1011107
Change-Id: I859b6f61ff9011819daf3fe73811456b352ee1dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2481908
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819689}

content/test/gpu/gpu_tests/gpu_integration_test.py

@@ -563,6 +563,26 @@ class GpuIntegrationTest(
         '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
+        'vmware,-0x1050',  # ChromeOS VMs
+        # Fuchsia VMs
+        ('google-angle-(vulkan-1.1.0(swiftshader-device-('
+         'llvm-7.0.1)-(0x0000c0de)))'),
+        # These browsers are analogous to a particular OS, and specifying the
+        # OS name is clearer.
+        'cros-chrome',  # ChromeOS
+        'web-engine-shell',  # Fuchsia
+        # WebGL version is already handled by having expectations in separate
+        # files.
+        # TODO(crbug.com/1140283): Consider merging the two files and using
+        # these tags once stale expectations are removed and the files are more
+        # reasonably sized.
+        'webgl-version-1',
+        'webgl-version-2',
+        # GPU tests are always run in remote mode on the bots, and it shouldn't
+        # make a difference to these tests anyways.
+        'chromeos-local',
+        'chromeos-remote',
     ]
 
 

content/test/gpu/gpu_tests/test_expectations/context_lost_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/depth_capture_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/gpu_process_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/hardware_accelerated_feature_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/maps_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/power_measurement_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/screenshot_sync_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt

 # BEGIN TAG HEADER (autogenerated, see validate_tag_consistency.py)
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -21,10 +23,11 @@
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend

content/test/gpu/validate_tag_consistency.py

@@ -11,11 +11,13 @@ import sys
 
 TAG_HEADER = """\
 # OS
-# tags: [ android android-pie
+# tags: [ android android-lollipop android-marshmallow android-nougat
+#             android-pie
 #         chromeos
 #         fuchsia
-#         linux
-#         mac catalina lion highsierra mojave mountainlion sierra
+#         linux ubuntu
+#         mac bigsur catalina lion highsierra mac-10.12 mojave mountainlion
+#             sierra
 #         win win7 win8 win10 ]
 # Devices
 # tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
@@ -32,10 +34,11 @@ TAG_HEADER = """\
 # GPU
 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f
 #         apple apple-apple-a12z
+#         arm
+#         google google-0xffff
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         qualcomm
-#         google-0xffff ]
+#         qualcomm ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
 # ANGLE Backend