diff options
| author | Aaron Holden <aaronholden@google.com> | 2017-05-16 20:26:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 20:26:24 +0000 |
| commit | 6fdf4c076f87f8eee4bf7e0deae74b5ec4146c23 (patch) | |
| tree | 9a5f4a2ffa77d1e4eee6fd2878dac14c4e162651 | |
| parent | 77a44317489f3bc98e3f7cd67c9a45e9e6c035d5 (diff) | |
| parent | 067e606bd990636064846ef58fc3fdb7d8912b5a (diff) | |
| download | cts-6fdf4c076f87f8eee4bf7e0deae74b5ec4146c23.tar.gz | |
Merge "Merge "Add failures html file to retry file copy blacklist" into nougat-cts-dev am: 6a874de533" into nougat-mr1-cts-dev
am: 067e606bd9
Change-Id: I323272ef6da464cd3b08a4f7e8be5f75cdbc45ea
| -rw-r--r-- | common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java | 3 | ||||
| -rw-r--r-- | common/util/src/com/android/compatibility/common/util/ResultHandler.java | 2 |
2 files changed, 3 insertions, 2 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 d457bdbad21..32d3cdab092 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 @@ -82,7 +82,8 @@ public class ResultReporter implements ILogSaverListener, ITestInvocationListene private static final List<String> NOT_RETRY_FILES = Arrays.asList( ChecksumReporter.NAME, - ChecksumReporter.PREV_NAME); + ChecksumReporter.PREV_NAME, + ResultHandler.FAILURE_REPORT_NAME); @Option(name = CompatibilityTest.RETRY_OPTION, shortName = 'r', diff --git a/common/util/src/com/android/compatibility/common/util/ResultHandler.java b/common/util/src/com/android/compatibility/common/util/ResultHandler.java index 67f22987a43..23ce5e0050e 100644 --- a/common/util/src/com/android/compatibility/common/util/ResultHandler.java +++ b/common/util/src/com/android/compatibility/common/util/ResultHandler.java @@ -59,7 +59,7 @@ public class ResultHandler { private static final String NS = null; private static final String RESULT_FILE_VERSION = "5.0"; public static final String TEST_RESULT_FILE_NAME = "test_result.xml"; - private static final String FAILURE_REPORT_NAME = "test_result_failures.html"; + public static final String FAILURE_REPORT_NAME = "test_result_failures.html"; private static final String FAILURE_XSL_FILE_NAME = "compatibility_failures.xsl"; public static final String[] RESULT_RESOURCES = { |