diff options
| -rw-r--r-- | test/145-alloc-tracking-stress/src/Main.java | 1 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 10 |
2 files changed, 3 insertions, 8 deletions
diff --git a/test/145-alloc-tracking-stress/src/Main.java b/test/145-alloc-tracking-stress/src/Main.java index 418690a2a6..752fdd9135 100644 --- a/test/145-alloc-tracking-stress/src/Main.java +++ b/test/145-alloc-tracking-stress/src/Main.java @@ -1,4 +1,5 @@ /* + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index bb7daf821b..30f1d78f2d 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -538,9 +538,7 @@ endif TEST_ART_BROKEN_OPTIMIZING_DEBUGGABLE_RUN_TESTS := # Tests that should fail in the read barrier configuration with the interpreter. -# 145: Test sometimes times out in read barrier configuration (b/27467554). -TEST_ART_BROKEN_INTERPRETER_READ_BARRIER_RUN_TESTS := \ - 145-alloc-tracking-stress +TEST_ART_BROKEN_INTERPRETER_READ_BARRIER_RUN_TESTS := # Tests that should fail in the read barrier configuration with the default (Quick) compiler (AOT). # Quick has no support for read barriers and punts to the interpreter, so this list is composed of @@ -550,7 +548,6 @@ TEST_ART_BROKEN_DEFAULT_READ_BARRIER_RUN_TESTS := \ $(TEST_ART_BROKEN_INTERPRETER_RUN_TESTS) # Tests that should fail in the read barrier configuration with the Optimizing compiler (AOT). -# 145: Test sometimes times out in read barrier configuration (b/27467554). # 484: Baker's fast path based read barrier compiler instrumentation generates code containing # more parallel moves on x86, thus some Checker assertions may fail. # 527: On ARM64, the read barrier instrumentation does not support the HArm64IntermediateAddress @@ -558,15 +555,12 @@ TEST_ART_BROKEN_DEFAULT_READ_BARRIER_RUN_TESTS := \ # 537: Expects an array copy to be intrinsified on x86-64, but calling-on-slowpath intrinsics are # not yet handled in the read barrier configuration. TEST_ART_BROKEN_OPTIMIZING_READ_BARRIER_RUN_TESTS := \ - 145-alloc-tracking-stress \ 484-checker-register-hints \ 527-checker-array-access-split \ 537-checker-arraycopy # Tests that should fail in the read barrier configuration with JIT (Optimizing compiler). -# 145: Test sometimes times out in read barrier configuration (b/27467554). -TEST_ART_BROKEN_JIT_READ_BARRIER_RUN_TESTS := \ - 145-alloc-tracking-stress +TEST_ART_BROKEN_JIT_READ_BARRIER_RUN_TESTS := ifeq ($(ART_USE_READ_BARRIER),true) ifneq (,$(filter interpreter,$(COMPILER_TYPES))) |