commit 0122e754e9598911307afce673ba8e60413ef360
author Orion Hodson <oth@google.com> Tue Apr 13 13:31:05 2021 +0100
committer Orion Hodson <oth@google.com> Tue Apr 13 14:57:23 2021 +0000
tree 615bc548bfb1bf3456c906bd5570021847973796
parent c046db79d0a17b305697ea60e134a6d1907b8009

tools: refine inclusion of debug failures to avoid fugu

Fugu expectations overlap with debug expectations which vogar then
rejects because of duplicates.

Test: art/tools/run-libcore-tests.sh --mode=device --debug --
  libcore.java.math.BigIntegerTest
Bug: 181968447
Change-Id: Ic73932108b9949e2b0b06eae2e251f94b3cae63d

tools/run-libcore-tests.sh

diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 0be5b56..1f39e7d 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -313,7 +313,8 @@
     # of -XX:AlwayLogExplicitGcs:false.
     vogar_args="$vogar_args --vm-arg -XX:LongPauseLogThreshold=15" # 15 ms (default: 5ms)
   else
-    if $debug; then
+    # Include debug expectations if not on fugu.
+    if $debug && $getrandom; then
       expectations="$expectations --expectations art/tools/libcore_debug_failures.txt"
     fi