Remove pokemon_go from ANGLE Allowlist Pokemon_go grass is not rendering correctly: b/406827038. While we have a fix in ANGLE, the fix is not likely approved to get in release branch without a guarded flag. Remove the game from allowlist. Flag: TEST_ONLY Test: atest AngleAllowlistTraceTest Bug: b/370845648 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c5bfb9f5cc2e1e9ca4f2d6ae8b5eb8c6349b7b4) Merged-In: I682b5095d70baf3660b1f0459ce491ad942500d5 Change-Id: I682b5095d70baf3660b1f0459ce491ad942500d5
diff --git a/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java b/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java index fc2ba76..0ffba14 100644 --- a/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java +++ b/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlist.java
@@ -29,7 +29,6 @@ apps.put("com.ludo.king", "ludo_king"); apps.put("com.mojang.minecraftpe", "minecraft_bedrock"); apps.put("com.my.defense", "rush_royale"); - apps.put("com.nianticlabs.pokemongo", "pokemon_go"); apps.put("com.nintendo.zaka", "mario_kart_tour"); apps.put("com.os.airforce", "1945_air_force"); apps.put("com.playrix.fishdomdd.gplay", "fishdom");
diff --git a/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java b/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java index 5015921..3b6c028 100644 --- a/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java +++ b/tests/angleallowliststrace_test/host/src/com/google/android/angleallowlists/vts/AngleAllowlistTraceTest.java
@@ -607,6 +607,7 @@ // Launch angle_trace_tests app with --list-test argument to get the list of trace names List<String> traceNames = runAngleListTrace(mTestHelper, gtestStdoutFile); + // Verify the traces in angle_traces package contains all required ANGLE allowlist apps verifyTraceList(traceNames); // Delete angle_debug_package global settings so that when trace is set to run @@ -614,8 +615,8 @@ mTestHelper.adbShellCommandCheck(mTestHelper.WAIT_SET_GLOBAL_SETTING_MILLIS, "settings delete global angle_debug_package"); - // Run all the trace tests. - for (final String traceName : traceNames) { + // Run all the trace test of apps required on ANGLE allowlist. + for (final String traceName : AngleAllowlist.apps.values()) { // push the "<traceName>.json" onto the device String traceJsonFileName = String.format("%s.json", traceName); final File traceJsonFile = mTestHelper.path(angleTraceTestPackage, "src", "tests", @@ -653,7 +654,7 @@ // Check all required traces completed successfully assertTrue(String.format("Not all required traces are ran, traces that are skipped: %s", mSkippedTrace.toString()), - mTracePerfANGLEFPS.size() == traceNames.size()); + mTracePerfANGLEFPS.size() == AngleAllowlist.apps.size()); // Check trace test result Set<String> failedTraceList = new HashSet<String>();