summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Igor Murashkin <iam@google.com> 2017-04-10 13:13:55 -0700
committer Igor Murashkin <iam@google.com> 2017-04-10 13:13:55 -0700
commitd5886c96d3714870f29cb1f4b948f50eb06c1afd (patch)
treeaec983711d987a89711fadd8cc1c8f0c54e1bfab
parentef6787bd892b55588ebb2835cc3a3bc4e9e08d04 (diff)
target_config: add art-test-javac target
Effectively runs the same commands as: ANDROID_COMPILE_WITH_JACK=false make test-art-host This builds libcore/art with javac/dx/desugar, then runs the gtests and run-tests for it. (It does not yet fix run-test to use javac everywhere. That will be a follow-up change). Bug: 36902714 Change-Id: Ibd226efcfe78c795474f98d69f513648cff5351a
-rw-r--r--test/testrunner/target_config.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/test/testrunner/target_config.py b/test/testrunner/target_config.py
index 82f7832e72..8e29b8e20a 100644
--- a/test/testrunner/target_config.py
+++ b/test/testrunner/target_config.py
@@ -19,8 +19,8 @@ target_config = {
##########################################
- # ART run-test configurations
- # (calls testrunner which builds and then runs the test targets)
+ # General ART configurations.
+ # Calls make and testrunner both.
'art-test' : {
'make' : 'test-art-host-gtest',
@@ -29,6 +29,19 @@ target_config = {
'ART_USE_READ_BARRIER' : 'false'
}
},
+
+ 'art-test-javac' : {
+ 'make' : 'test-art-host-gtest',
+ 'run-test' : [],
+ 'env' : {
+ 'ANDROID_COMPILE_WITH_JACK' : 'false',
+ 'ART_USE_READ_BARRIER' : 'true'
+ }
+ },
+
+ # ART run-test configurations
+ # (calls testrunner which builds and then runs the test targets)
+
'art-interpreter' : {
'run-test' : ['--interpreter'],
'env' : {