infra: Shard restricted_trace_gold_tests.

infra/specs/angle.json

@@ -451,7 +451,8 @@
               "pool": "chromium.tests.gpu"
             }
           ],
-          "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
+          "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 10
         },
         "test_id_prefix": "ninja://src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
       }

infra/specs/test_suites.pyl

@@ -696,6 +696,9 @@
           'angle_skia_gold_test',
           'chrome-gpu-gold-service-account',
         ],
+        'android_swarming': {
+          'shards': 10,
+        },
       }
     },
 

scripts/code_generation_hashes/Test_spec_JSON.json

 {
   "infra/specs/angle.json":
-    "1d195613e07df4010e92b580255cf9ef",
+    "7aa834fc28218feab49fc9e493cd2df0",
   "infra/specs/generate_test_spec_json.py":
     "e1c8a771f751adad715d7bea900fc8e1",
   "infra/specs/mixins.pyl":
@@ -8,7 +8,7 @@
   "infra/specs/test_suite_exceptions.pyl":
     "aad1a4aed801277cc531733deab221b5",
   "infra/specs/test_suites.pyl":
-    "5975c48c318aacece3429cb91b04b4b6",
+    "cbe697ca035dc9310f6821e9b628cc6a",
   "infra/specs/variants.pyl":
     "8cfcaa99fa07ad2a2d5d14f220fd5037",
   "infra/specs/waterfalls.pyl":

src/tests/restricted_traces/restricted_trace_gold_tests.py

@@ -204,8 +204,11 @@ def get_skia_gold_keys(args):
             return self.lines
 
     with common.temporary_file() as tempfile_path:
+        sysinfo_env = env.copy()
+        sysinfo_env.pop('GTEST_TOTAL_SHARDS', None)
+        sysinfo_env.pop('GTEST_SHARD_INDEX', None)
         binary = get_binary_name('angle_system_info_test')
-        if run_wrapper(args, [binary, '--vulkan', '-v'], env, tempfile_path):
+        if run_wrapper(args, [binary, '--vulkan', '-v'], sysinfo_env, tempfile_path):
             raise Exception('Error getting system info.')
 
         filter = Filter()