Account for ProGuard tests when enabling completeness checking

Change-Id: I4253ef390317e8bf06d79120ea4a8913328b0903

src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java

diff --git a/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
index 5ba9de1..0e28732 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -322,12 +322,10 @@
           };
     }
 
-    boolean enableCompletenessCheckForTesting =
-        (isD8TestBuilder() || isR8TestBuilder()) && !isBenchmarkRunner;
-    addOptionsModification(
-        o ->
-            o.getArtProfileOptions()
-                .setEnableCompletenessCheckForTesting(enableCompletenessCheckForTesting));
+    if (isD8TestBuilder() || isR8TestBuilder()) {
+      addOptionsModification(
+          o -> o.getArtProfileOptions().setEnableCompletenessCheckForTesting(!isBenchmarkRunner));
+    }
 
     builder.setOptimizeMultidexForLinearAlloc(optimizeMultidexForLinearAlloc);
     if (useDefaultRuntimeLibrary) {