From 1a6f22da714bede428704ffafe1f49eb715ef620 Mon Sep 17 00:00:00 2001
From: "John \"Juce\" Bruce" <juce@google.com>
Date: Fri, 15 Jan 2016 15:04:37 -0800
Subject: [PATCH] Warn on Verity

(This is a merge of http://go/wvgerrit/16496 )

run_all_unit_tests.sh now aborts and alerts the user if they have
Verity on, as opposed to its current behavior of failing later when
the tests don't copy over successfully.

Bug: 23420350
Change-Id: Ib01d32caaac462974b051f5d019888f7c47bc745
---
 libwvdrmengine/run_all_unit_tests.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh
index 942db0f3..a6d15e3a 100755
--- a/libwvdrmengine/run_all_unit_tests.sh
+++ b/libwvdrmengine/run_all_unit_tests.sh
@@ -34,7 +34,15 @@ if [ -z "$ANDROID_BUILD_TOP" ]; then
 fi
 
 echo "waiting for device"
-adb root && adb wait-for-device remount
+ADB_OUTPUT=`adb root && adb wait-for-device remount`
+echo $ADB_OUTPUT
+if echo $ADB_OUTPUT | grep -qi "verity"; then
+  echo
+  echo "ERROR: This device has Verity enabled. run_all_unit_tests.sh does not "
+  echo "work if Verity is enabled. Please disable Verity with"
+  echo "\"adb disable-verity\" and try again."
+  exit -1
+fi
 
 adb_shell_run GTEST_FILTER="$GTEST_FILTER:*Level1Required" FORCE_LEVEL3_OEMCRYPTO=yes \
   /system/bin/oemcrypto_test