Revert "Jdk11NioTests should run with a different test dir"
This reverts commit 5230d8ff352ed61a67fae498f577b5cb1349b76c.
Reason for revert: Breaks Jdk11NioFileTests
Change-Id: Ia40b30ebcb9aa4095ef31e7d66c543f137ce10ab
diff --git a/src/test/java/com/android/tools/r8/TestCompileResult.java b/src/test/java/com/android/tools/r8/TestCompileResult.java
index fda4235..dfdfa9d 100644
--- a/src/test/java/com/android/tools/r8/TestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/TestCompileResult.java
@@ -64,6 +64,7 @@
final List<Path> additionalBootClasspath = new ArrayList<>();
final List<String> vmArguments = new ArrayList<>();
private boolean withArt6Plus64BitsLib = false;
+ private boolean withArtFrameworks = true;
private LibraryDesugaringTestConfiguration libraryDesugaringTestConfiguration;
TestCompileResult(TestState state, AndroidApp app, int minApiLevel, OutputMode outputMode) {
@@ -119,6 +120,11 @@
return self();
}
+ public final CR withArtFrameworks() {
+ withArtFrameworks = true;
+ return self();
+ }
+
public final AndroidApp getApp() {
return app;
}
@@ -681,7 +687,8 @@
}
});
ProcessResult result =
- ToolHelper.runArtRaw(classPath, mainClass, commandConsumer, vm, true, arguments);
+ ToolHelper.runArtRaw(
+ classPath, mainClass, commandConsumer, vm, withArtFrameworks, arguments);
return createRunResult(runtime, result);
}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
index 36a79b4..ed6b91a 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11NioFileTests.java
@@ -279,7 +279,6 @@
@Test
public void testNioFileDesugaredLib() throws Exception {
String verbosity = "2";
- Path testDir = temp.newFolder("jdknio").toPath();
DesugaredLibraryTestCompileResult<?> compileResult =
testForDesugaredLibrary(
parameters, libraryDesugaringSpecification, compilationSpecification)
@@ -288,7 +287,6 @@
.addProgramFiles(testNGSupportProgramFiles())
.addProgramClassFileData(getTestNGMainRunner())
.compile()
- .setSystemProperty("test.dir", testDir.toString())
.withArt6Plus64BitsLib();
int success = 0;
List<String> failingClasses = new ArrayList<>();
@@ -340,7 +338,6 @@
"The package java.nio was not present on older devices, all tests fail.",
parameters.getDexRuntimeVersion().isOlderThan(Version.V8_1_0));
String verbosity = "2";
- Path testDir = temp.newFolder("jdknio").toPath();
D8TestCompileResult compileResult =
testForD8(parameters.getBackend())
.addProgramFiles(TEST_UTIL_JAR)
@@ -349,7 +346,6 @@
.addProgramClassFileData(getTestNGMainRunner())
.addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
.compile()
- .setSystemProperty("test.dir", testDir.toString())
.withArt6Plus64BitsLib();
for (String mainTestClass : SUCCESSFUL_MAIN_TESTS) {
compileResult.run(parameters.getRuntime(), mainTestClass).assertSuccess();
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
index 8db3b41..221a5c7 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestCompileResult.java
@@ -182,9 +182,4 @@
runnableCompiledResult.withArt6Plus64BitsLib();
return this;
}
-
- public DesugaredLibraryTestCompileResult<T> setSystemProperty(String key, String value) {
- runnableCompiledResult.setSystemProperty(key, value);
- return this;
- }
}
