commit 3e7ea397b8ffa81370d73da4c1b5c11dfd68366c
author Clément Béra <clementbera@google.com> Mon May 18 13:13:21 2020 +0000
committer Clément Béra <clementbera@google.com> Mon May 18 13:26:25 2020 +0000
tree 6d7a9b63d9f748defea63974ab91e2345e185ad9
parent 53357603a80007f858d798e933921a43c6a1735f

Re-enable Art-10 bot

Bug: 144966342
Change-Id: I98301e0eb1ad4a39b82afc212e5c6d7fac821284

tools/run-jdwp-tests.py

diff --git a/tools/run-jdwp-tests.py b/tools/run-jdwp-tests.py
index 2ef479d..f40f2ce 100755
--- a/tools/run-jdwp-tests.py
+++ b/tools/run-jdwp-tests.py
@@ -15,6 +15,7 @@
 
 VERSIONS = [
   'default',
+  '10.0.0',
   '9.0.0',
   '8.1.0',
   '7.0.0',
@@ -102,7 +103,7 @@
     flags.extend(['-Ximage:%s' % IMAGE])
     if version != '5.1.1':
       flags.extend(['-Xcompiler-option', '--debuggable'])
-  if version == '9.0.0':
+  if version == '9.0.0' or version == '10.0.0':
     flags.extend(['-XjdwpProvider:internal'])
   return flags
 

tools/test.py

diff --git a/tools/test.py b/tools/test.py
index d6e4983..95766ca 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -156,10 +156,6 @@
 
 def Main():
   (options, args) = ParseOptions()
-  # See b/144966342
-  if options.dex_vm == '10.0.0':
-    print 'Running on 10.0.0 is temporarily disabled, see b/144966342'
-    return 0
 
   if utils.is_bot():
     gradle.RunGradle(['--no-daemon', 'clean'])