Merge "Allow monkey process to fail with non-zero exit code"
diff --git a/build.gradle b/build.gradle
index 272fcdd..496dc65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -533,7 +533,7 @@
mergeServiceFiles(it)
exclude { it.getRelativePath().getPathString() == "module-info.class" }
exclude { it.getRelativePath().getPathString().startsWith("META-INF/maven/") }
- baseName 'deps'
+ baseName 'deps_not_relocated'
}
task repackageDeps(type: ShadowJar) {
diff --git a/src/test/java/com/android/tools/r8/ExternalR8TestBuilder.java b/src/test/java/com/android/tools/r8/ExternalR8TestBuilder.java
index e9d85be..1daaad3 100644
--- a/src/test/java/com/android/tools/r8/ExternalR8TestBuilder.java
+++ b/src/test/java/com/android/tools/r8/ExternalR8TestBuilder.java
@@ -50,6 +50,8 @@
// Additional Proguard configuration files.
private List<Path> proguardConfigFiles = new ArrayList<>();
+ private boolean addR8ExternalDeps = false;
+
private ExternalR8TestBuilder(TestState state, Builder builder, Backend backend) {
super(state, builder, backend);
}
@@ -72,13 +74,18 @@
Path outputJar = outputFolder.resolve("output.jar");
Path proguardMapFile = outputFolder.resolve("output.jar.map");
+ String classPath =
+ addR8ExternalDeps
+ ? r8jar.toAbsolutePath().toString() + ":" + ToolHelper.DEPS_NOT_RELOCATED
+ : r8jar.toAbsolutePath().toString();
+
List<String> command = new ArrayList<>();
Collections.addAll(
command,
getJavaExecutable(),
"-ea",
"-cp",
- r8jar.toAbsolutePath().toString(),
+ classPath,
R8.class.getTypeName(),
"--output",
outputJar.toAbsolutePath().toString(),
@@ -182,4 +189,9 @@
this.r8jar = r8jar;
return self();
}
+
+ public ExternalR8TestBuilder addR8ExternalDepsToClasspath() {
+ this.addR8ExternalDeps = true;
+ return self();
+ }
}
diff --git a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
index 35dafae..bfffcc9 100644
--- a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
+++ b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
@@ -741,8 +741,6 @@
any())
.put("lang.Long.serialization.Long_serialization_A01", anyDexVm())
.put("lang.ThreadGroup.resume.ThreadGroup_resume_A01", anyDexVm())
- .put("lang.ThreadGroup.resume.ThreadGroup_resume_A02", cf())
- .put("lang.ThreadGroup.suspend.ThreadGroup_suspend_A02", cf())
.put(
"lang.AbstractMethodError.serialization.AbstractMethodError_serialization_A01",
anyDexVm())
@@ -1066,7 +1064,6 @@
.put(
"lang.SecurityManager.checkAccessLjava_lang_ThreadGroup.SecurityManager_checkAccess_A01",
anyDexVm())
- .put("lang.ThreadGroup.interrupt.ThreadGroup_interrupt_A02", cf())
.put(
"lang.SecurityManager.inClassLjava_lang_String.SecurityManager_inClass_A03",
anyDexVm())
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 64c735d..1a17a62 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -118,6 +118,8 @@
public static final Path R8_JAR = Paths.get(LIBS_DIR, "r8.jar");
public static final Path R8_WITH_RELOCATED_DEPS_JAR =
Paths.get(LIBS_DIR, "r8_with_relocated_deps.jar");
+ public static final Path DEPS_NOT_RELOCATED =
+ Paths.get(LIBS_DIR, "deps_not_relocated.jar");
public enum DexVm {
ART_4_0_4_TARGET(Version.V4_0_4, Kind.TARGET),
diff --git a/tools/internal_test.py b/tools/internal_test.py
index d34f74b..f5956e8 100755
--- a/tools/internal_test.py
+++ b/tools/internal_test.py
@@ -60,7 +60,7 @@
]
# Command timeout, in seconds.
-RUN_TIMEOUT = 7200
+RUN_TIMEOUT = 3600 * 3
BOT_RUN_TIMEOUT = RUN_TIMEOUT * len(TEST_COMMANDS)
def log(str):
