commit 0c32fdeaeda2a1e388e280da12662d1d18c834a2
author Roland Levillain <rpl@google.com> Mon Nov 23 19:25:48 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 23 19:25:48 2015 +0000
tree 0178af5853d9b3881b17cbad5b97dd66cf1ae6ab
parent db001ab8d8a03084079631485bc5e007b86d1dee
parent f2a5c9c5669664ad008ed48f511e8f101d4bc299

Merge "Disable JDWP tests with read barriers."

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index 0747712..47fc50f 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -28,6 +28,18 @@
   exit 1
 fi
 
+if [ "x$ART_USE_READ_BARRIER" = xtrue ]; then
+  # For the moment, skip JDWP tests when read barriers are enabled, as
+  # they sometimes exhibit a deadlock issue with the concurrent
+  # copying collector in the read barrier configuration, between the
+  # HeapTaskDeamon and the JDWP thread (b/25800335).
+  #
+  # TODO: Re-enable the JDWP tests when this deadlock issue is fixed.
+  echo "JDWP tests are temporarily disabled in the read barrier configuration because of"
+  echo "a deadlock issue (b/25800335)."
+  exit 0
+fi
+
 art="/data/local/tmp/system/bin/art"
 art_debugee="sh /data/local/tmp/system/bin/art"
 args=$@