commit cfb2c0545c5ef973dda1597f95ec45c9aa1316c3
author Tamas Kenez <tamaskenez@google.com> Fri Oct 12 11:03:57 2018 +0200
committer Tamas Kenez <tamaskenez@google.com> Fri Oct 12 11:03:57 2018 +0200
tree 5373d861175ffbdffc928cfc713986e2868db659
parent 9ea5e803cd6c6af33e0c5dd878e72381006993c2

JCTF testing: fix and extend --tool flag with 'r8cf' option.

Previous r8 and d8 options both ran the r8cf tests, too.

Change-Id: I2ad70046d385200370e77b93e64917dbbfbd8f64

build.gradle

diff --git a/build.gradle b/build.gradle
index f5a3337..cfaacdb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1310,17 +1310,23 @@
         if (project.property('tool') == 'r8') {
             exclude "com/android/tools/r8/art/*/d8/**"
             exclude "com/android/tools/r8/jctf/d8/**"
-        } else {
-            assert(project.property('tool') == 'd8')
+            exclude "com/android/tools/r8/jctf/r8cf/**"
+        } else if (project.property('tool') == 'd8') {
             exclude "com/android/tools/r8/art/*/r8/**"
             exclude "com/android/tools/r8/jctf/r8/**"
+            exclude "com/android/tools/r8/jctf/r8cf/**"
+        } else {
+            assert(project.property('tool') == 'r8cf')
+            exclude "com/android/tools/r8/art/*/d8/**"
+            exclude "com/android/tools/r8/art/*/r8/**"
+            exclude "com/android/tools/r8/jctf/d8/**"
+            exclude "com/android/tools/r8/jctf/r8/**"
         }
     }
     if (!project.hasProperty('all_tests')) {
         exclude "com/android/tools/r8/art/dx/**"
         exclude "com/android/tools/r8/art/jack/**"
     }
-    // TODO(tamaskenez) enable jctf on all_tests when consolidated
     if (!project.hasProperty('jctf') && !project.hasProperty('only_jctf')) {
         exclude "com/android/tools/r8/jctf/**"
     }