diff options
| -rw-r--r-- | tools/libcore_failures.txt | 7 | ||||
| -rw-r--r-- | tools/libcore_failures_concurrent_collector.txt | 20 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 8 |
3 files changed, 27 insertions, 8 deletions
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt index 6e1ec49b40..839e1e6761 100644 --- a/tools/libcore_failures.txt +++ b/tools/libcore_failures.txt @@ -171,13 +171,6 @@ bug: 25437292 }, { - description: "Assertion failing on the concurrent collector configuration.", - result: EXEC_FAILED, - names: ["jsr166.LinkedTransferQueueTest#testTransfer2", - "jsr166.LinkedTransferQueueTest#testWaitingConsumer"], - bug: 25883050 -}, -{ description: "Failing tests after enso move.", result: EXEC_FAILED, bug: 26326992, diff --git a/tools/libcore_failures_concurrent_collector.txt b/tools/libcore_failures_concurrent_collector.txt new file mode 100644 index 0000000000..95f0c2dcf2 --- /dev/null +++ b/tools/libcore_failures_concurrent_collector.txt @@ -0,0 +1,20 @@ +/* + * 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. + */ + +[ +{ + description: "Assertion failing on the concurrent collector configuration.", + result: EXEC_FAILED, + names: ["jsr166.LinkedTransferQueueTest#testTransfer2", + "jsr166.LinkedTransferQueueTest#testWaitingConsumer"], + bug: 25883050 +} +] diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 11ed8b94be..f346239763 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -32,6 +32,12 @@ if [ ! -f $test_jar ]; then exit 1 fi +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 emulator="yes" @@ -105,4 +111,4 @@ vogar_args="$vogar_args --timeout 480" # Run the tests using vogar. echo "Running tests for the following test packages:" echo ${working_packages[@]} | tr " " "\n" -vogar $vogar_args --vm-arg -Xusejit:true --expectations art/tools/libcore_failures.txt --classpath $jsr166_test_jar --classpath $test_jar ${working_packages[@]} +vogar $vogar_args --vm-arg -Xusejit:true $expectations --classpath $jsr166_test_jar --classpath $test_jar ${working_packages[@]} |