Don't run jack based tests
Change-Id: I225d7a572ee7b2c8c7ec018421b10e5edd1c5dbb
diff --git a/build.gradle b/build.gradle
index d9fd85d..aabf814 100644
--- a/build.gradle
+++ b/build.gradle
@@ -250,7 +250,6 @@
def cloudDependencies = [
"tests" : [
"2017-10-04/art",
- "2016-12-19/art"
],
"third_party": [
"android_cts_baseline",
@@ -1557,14 +1556,6 @@
if (project.hasProperty('dex_vm') && project.property('dex_vm') != 'default') {
println "Running with non default vm: " + project.property('dex_vm')
systemProperty 'dex_vm', project.property('dex_vm')
- if (project.property('dex_vm').startsWith('4.4.4') ||
- project.property('dex_vm').startsWith('5.1.1') ||
- project.property('dex_vm').startsWith('6.0.1')) {
- // R8 and D8 compute the dex file version number based on the input.
- // Jack generates dex files with version 37 which art 5.1.1 and 6.0.1 will not run.
- // Therefore we skip the jack generated art tests with those art versions.
- exclude "com/android/tools/r8/art/jack/**"
- }
}
if (project.hasProperty('one_line_per_test')) {
@@ -1593,6 +1584,7 @@
if (project.hasProperty('only_internal')) {
include "com/android/tools/r8/internal/**"
}
+
if (project.hasProperty('tool')) {
if (project.property('tool') == 'r8') {
exclude "com/android/tools/r8/art/*/d8/**"
@@ -1612,7 +1604,6 @@
}
if (!project.hasProperty('all_tests')) {
exclude "com/android/tools/r8/art/dx/**"
- exclude "com/android/tools/r8/art/jack/**"
}
if (!project.hasProperty('jctf') && !project.hasProperty('only_jctf')) {
exclude "com/android/tools/r8/jctf/**"
diff --git a/tools/create_art_tests.py b/tools/create_art_tests.py
index 61db8a8..248f893 100755
--- a/tools/create_art_tests.py
+++ b/tools/create_art_tests.py
@@ -9,12 +9,9 @@
OUTPUT_DIR = os.path.join('build', 'generated', 'test', 'java', 'com',
'android', 'tools', 'r8', 'art')
-# Test that comes from Jack are generated from the legacy snapshot.
-JACK_TEST = os.path.join('tests', '2016-12-19', 'art')
TEST_DIR = os.path.join('tests', '2017-10-04', 'art')
TOOLCHAINS = [
("dx", os.path.join(TEST_DIR, "dx")),
- ("jack", os.path.join(JACK_TEST, "jack")),
("none", os.path.join(TEST_DIR, "dx")),
]
TOOLS = ["r8", "d8", "r8cf"]
