Work around for 910-method with D8
There is no good way to tell if we are using D8 or not so we are
not able to determine if we should patch the referene file or not.
To work around the issue, we are going to try to patch D8's expected
output should the initial check fails.
Bug: 68406220
Test: ./art/test.py --host -r -t 910-methods
Change-Id: If22318c69eca809398d98d063b3c586010c53515
diff --git a/test/910-methods/check b/test/910-methods/check
index e6f7d77..76b23cb 100644
--- a/test/910-methods/check
+++ b/test/910-methods/check
@@ -19,8 +19,14 @@
patch -p0 expected.txt < expected_jack.diff
fi
-if [[ "$USE_D8" == true ]]; then
- patch -p0 expected.txt < expected_d8.diff
+./default-check "$@"
+if [[ "$?" == "0" ]]; then
+ exit 0;
fi
+# We cannot always correctly determine if D8 was used because of (b/68406220).
+# So we are just going to try to see it matches the expect output of D8 no
+# matter what.
+patch -p0 expected.txt < expected_d8.diff
+
./default-check "$@"