File cleanup during retry mode
Host-side file cleanup is now handled in ModuleRepo by the use of
File.deleteOnExit(). Device-side file cleanup for DalvikeTest is
overlooked since it generates at most two filtering files over infinite
invocations of the runner. A similar strategy will be applied for
AndroidJUnitTest's device-side file cleanup in tradefed.
bug:29362308
Change-Id: I0265449b3525c7ee2836b3c227173d2680684889
diff --git a/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java b/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
index d8e181c..8815dd2 100644
--- a/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
+++ b/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
@@ -40,6 +40,7 @@
import com.android.tradefed.testtype.ITestFileFilterReceiver;
import com.android.tradefed.testtype.ITestFilterReceiver;
import com.android.tradefed.util.ArrayUtil;
+import com.android.tradefed.util.FileUtil;
import com.android.tradefed.util.TimeVal;
import com.google.common.base.Splitter;
@@ -105,8 +106,8 @@
// include and exclude filters, and exclude filters file.
private static final String COMMAND = "dalvikvm%s -classpath %s %s "
+ "com.android.compatibility.dalvik.DalvikTestRunner --abi=%s %s %s %s %s %s %s";
- private static final String INCLUDE_FILE = "/data/local/tmp/ctsjdwp/includes";
- private static final String EXCLUDE_FILE = "/data/local/tmp/ctsjdwp/excludes";
+ private static final String INCLUDE_FILE = "/data/local/tmp/dalvik/includes";
+ private static final String EXCLUDE_FILE = "/data/local/tmp/dalvik/excludes";
private static String START_RUN = "start-run";
private static String END_RUN = "end-run";
private static String START_TEST = "start-test";
@@ -283,9 +284,7 @@
} catch (IOException e) {
throw new RuntimeException("Failed to parse expectations", e);
} finally {
- if (tmpExcludeFile != null) {
- tmpExcludeFile.delete();
- }
+ FileUtil.deleteFile(tmpExcludeFile);
}
// push one file of include filters to the device, if file exists