diff options
| -rw-r--r-- | runtime/gc/collector/concurrent_copying.h | 2 | ||||
| -rw-r--r-- | runtime/image.cc | 2 | ||||
| -rw-r--r-- | tools/libcore_failures_concurrent_collector.txt | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/runtime/gc/collector/concurrent_copying.h b/runtime/gc/collector/concurrent_copying.h index 5d21c599e4..76315fe7cc 100644 --- a/runtime/gc/collector/concurrent_copying.h +++ b/runtime/gc/collector/concurrent_copying.h @@ -57,7 +57,7 @@ class ConcurrentCopying : public GarbageCollector { // Enable the from-space bytes/objects check. static constexpr bool kEnableFromSpaceAccountingCheck = true; // Enable verbose mode. - static constexpr bool kVerboseMode = true; + static constexpr bool kVerboseMode = false; ConcurrentCopying(Heap* heap, const std::string& name_prefix = ""); ~ConcurrentCopying(); diff --git a/runtime/image.cc b/runtime/image.cc index 3cb66428fa..4254d949d9 100644 --- a/runtime/image.cc +++ b/runtime/image.cc @@ -24,7 +24,7 @@ namespace art { const uint8_t ImageHeader::kImageMagic[] = { 'a', 'r', 't', '\n' }; -const uint8_t ImageHeader::kImageVersion[] = { '0', '2', '5', '\0' }; +const uint8_t ImageHeader::kImageVersion[] = { '0', '2', '6', '\0' }; ImageHeader::ImageHeader(uint32_t image_begin, uint32_t image_size, diff --git a/tools/libcore_failures_concurrent_collector.txt b/tools/libcore_failures_concurrent_collector.txt index 6ea83d2777..95d12928f1 100644 --- a/tools/libcore_failures_concurrent_collector.txt +++ b/tools/libcore_failures_concurrent_collector.txt @@ -34,5 +34,13 @@ "libcore.java.util.zip.ZipFileTest#testZipFileWithLotsOfEntries", "libcore.java.util.zip.ZipInputStreamTest#testLongMessage"], bug: 26507762 +}, +{ + description: "TimeoutException on hammerhead-concurrent-collector", + result: EXEC_FAILED, + modes: [device], + names: ["libcore.icu.RelativeDateTimeFormatterTest#test_bug25821045", + "libcore.java.text.SimpleDateFormatTest#testLocales"], + bug: 26711853 } ] |