summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lokesh Gidra <lokeshgidra@google.com> 2022-08-30 18:06:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-30 18:06:24 +0000
commit2b2bc1f8c2fb0f1b4589944969b8ea377e67cd80 (patch)
tree6cc54c2d539b30b8cfe2385d333c4d928f32936b
parente08313c3e1e6f6cbbb67759214e1dbde11696c3c (diff)
parent4a149289edbdeea301e30cd76e4eab2bf263e478 (diff)
Skip some JDWP tests for userfaultfd GC am: 914dbf7af4 am: da01637e5a am: f5c1724978 am: 4a149289ed
Original change: https://android-review.googlesource.com/c/platform/art/+/2199975 Change-Id: I854b3e361cb261809ce7e259ff958541654f0461 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tools/external_oj_libjdwp_art_no_read_barrier_failures.txt17
-rwxr-xr-xtools/run-libjdwp-tests.sh4
2 files changed, 21 insertions, 0 deletions
diff --git a/tools/external_oj_libjdwp_art_no_read_barrier_failures.txt b/tools/external_oj_libjdwp_art_no_read_barrier_failures.txt
new file mode 100644
index 0000000000..7c590b11f6
--- /dev/null
+++ b/tools/external_oj_libjdwp_art_no_read_barrier_failures.txt
@@ -0,0 +1,17 @@
+/*
+ * This file contains expectations for ART's buildbot. The purpose of this file is
+ * to temporarily list failing tests and not break the bots.
+ *
+ * This file contains the expectations for the 'libjdwp-aot' and 'libjdwp-jit'
+ * test groups on the chromium buildbot running without read-barrier.
+ */
+[
+{
+ description: "Failing with userfaultfd GC",
+ result: EXEC_FAILED,
+ bug: 242181443,
+ names: [ "org.apache.harmony.jpda.tests.jdwp.ObjectReference_DisableCollectionTest#testDisableCollection001",
+ "org.apache.harmony.jpda.tests.jdwp.ObjectReference_IsCollectedTest#testIsCollected_invalid",
+ "org.apache.harmony.jpda.tests.jdwp.ObjectReference_IsCollectedTest#testIsCollected_null" ]
+}
+]
diff --git a/tools/run-libjdwp-tests.sh b/tools/run-libjdwp-tests.sh
index efb2737cad..06e34f9c3d 100755
--- a/tools/run-libjdwp-tests.sh
+++ b/tools/run-libjdwp-tests.sh
@@ -138,6 +138,10 @@ if [[ "$debug" = "yes" && "$has_gcstress" = "yes" ]]; then
expectations="$expectations --expectations $PWD/art/tools/external_oj_libjdwp_art_gcstress_debug_failures.txt"
fi
+if [[ "${ART_USE_READ_BARRIER}" = "false" ]]; then
+ expectations="$expectations --expectations $PWD/art/tools/external_oj_libjdwp_art_no_read_barrier_failures.txt"
+fi
+
function verbose_run() {
echo "$@"
env "$@"