Merge "Merge "Add retry file blacklist to prevent unwanted file copying" into nougat-cts-dev am: 3ec6656bf0" into nougat-mr1-cts-dev

am: 4bee3dc8eb

Change-Id: I733a1f4b678639cacfff0b32bb1caa560e1dae04

1 files changed, 9 insertions, 0 deletions

diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
index 97f466cbd61..d457bdbad21 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
@@ -20,6 +20,7 @@ import com.android.compatibility.common.tradefed.result.InvocationFailureHandler
 import com.android.compatibility.common.tradefed.result.TestRunHandler;
 import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
 import com.android.compatibility.common.tradefed.util.RetryType;
+import com.android.compatibility.common.util.ChecksumReporter;
 import com.android.compatibility.common.util.ICaseResult;
 import com.android.compatibility.common.util.IInvocationResult;
 import com.android.compatibility.common.util.IModuleResult;
@@ -60,6 +61,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -78,6 +80,10 @@ public class ResultReporter implements ILogSaverListener, ITestInvocationListene
     private static final String CTS_PREFIX = "cts:";
     private static final String BUILD_INFO = CTS_PREFIX + "build_";
 
+    private static final List<String> NOT_RETRY_FILES = Arrays.asList(
+            ChecksumReporter.NAME,
+            ChecksumReporter.PREV_NAME);
+
     @Option(name = CompatibilityTest.RETRY_OPTION,
             shortName = 'r',
             description = "retry a previous session.",
@@ -723,6 +729,9 @@ public class ResultReporter implements ILogSaverListener, ITestInvocationListene
     static void copyRetryFiles(File oldDir, File newDir) {
         File[] oldChildren = oldDir.listFiles();
         for (File oldChild : oldChildren) {
+            if (NOT_RETRY_FILES.contains(oldChild.getName())) {
+                continue; // do not copy this file/directory or its children
+            }
             File newChild = new File(newDir, oldChild.getName());
             if (!newChild.exists()) {
                 // If this old file or directory doesn't exist in new dir, simply copy it