commit d9dd38ceca92961af4bf42d68450575cf9937eb8
author Søren Gjesse <sgjesse@google.com> Thu Aug 09 10:27:29 2018 +0200
committer Søren Gjesse <sgjesse@google.com> Thu Aug 09 10:27:29 2018 +0200
tree a4b2fff2e76cad3be53671a035b7f996e58f7ea6
parent 513d69347aace156873cea4d70afb467a4a2f623

Use VmTestRunner to control execution of PostIncrementTestRunner

This should also remove the failure on the Windows bot.

Change-Id: I4a2001aee7b792892c247f3c244ae1cedc5c45e5

src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java

diff --git a/src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java b/src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java
index 4cfb71a..6ddc9db 100644
--- a/src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/PostIncrementTestRunner.java
@@ -5,18 +5,24 @@
 
 import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.ToolHelper.DexVm;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
+import com.android.tools.r8.VmTestRunner;
+import com.android.tools.r8.VmTestRunner.IgnoreIfVmOlderOrEqualThan;
 import com.android.tools.r8.debug.DebugTestBase.JUnit3Wrapper.DebuggeeState;
 import java.util.stream.Stream;
 import org.junit.Assume;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 // See b/80385846
+@RunWith(VmTestRunner.class)
 public class PostIncrementTestRunner extends DebugTestBase {
 
   private static final Class CLASS = PostIncrementTest.class;
   private static final String NAME = CLASS.getCanonicalName();
 
   @Test
+  @IgnoreIfVmOlderOrEqualThan(Version.V5_1_1)
   public void test() throws Exception {
     Assume.assumeTrue("Older runtimes cause some kind of debug streaming issues",
         ToolHelper.getDexVm().isNewerThan(DexVm.ART_5_1_1_HOST));