diff options
| -rw-r--r-- | tools/libcore_failures_concurrent_collector.txt | 13 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/tools/libcore_failures_concurrent_collector.txt b/tools/libcore_failures_concurrent_collector.txt deleted file mode 100644 index 0e289a66d7..0000000000 --- a/tools/libcore_failures_concurrent_collector.txt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file contains expectations for ART's buildbot's concurrent collector - * configurations. The purpose of this file is to temporary and quickly list - * failing tests and not break the bots on the CC configurations, until they - * are fixed or until the libcore expectation files get properly updated. The - * script that uses this file is art/tools/run-libcore-tests.sh. - * - * It is also used to enable AOSP experiments, and not mess up with CTS's - * expectations. - */ - -[ -] diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 01c7f203f9..41faa69c31 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -43,10 +43,6 @@ do done expectations="--expectations art/tools/libcore_failures.txt" -if [ "x$ART_USE_READ_BARRIER" = xtrue ]; then - # Tolerate some more failures on the concurrent collector configurations. - expectations="$expectations --expectations art/tools/libcore_failures_concurrent_collector.txt" -fi emulator="no" if [ "$ANDROID_SERIAL" = "emulator-5554" ]; then |