Revert^2 "Disable JUnit 5 for now"

This reverts commit 21bed591dc5eca375d031f9f20bc379da1f7d213.

Revert^2 "Disable JUnit 5 for now"

This reverts commit 21bed591dc5eca375d031f9f20bc379da1f7d213.

Reason for revert: was reverted as an experiment

Bug: b/489058560
Change-Id: If68c3c79a01355066ea38c4f5dc4dd059c7d8a49

d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt

diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt b/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
index 7a9f7d9..04df04e 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
@@ -209,7 +209,9 @@
     }
 
     public fun setupTestTask(test: Test, isR8Lib: Boolean, r8Jar: File?, r8LibMappingFile: File?) {
-      test.useJUnitPlatform()
+      // TODO(b/489058560) Enable when we have figured out re-running single test variants.
+      // test.useJUnitPlatform()
+      test.useJUnit()
       test.systemProperty("junit.jupiter.execution.parallel.enabled", "true")
       val project = test.project
       if (project.hasProperty("testfilter")) {