From 19605579d5e19b8148c3eb22b1a1f781f7f2867a Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Mon, 24 Feb 2020 14:41:34 -0800
Subject: [PATCH] Search for test executables in odk_test

[ Merge of http://go/wvgerrit/94507 ]

./build_and_run_all_tests.sh runs all WV unit/integration tests.
It searches for unit/integration tests in $OUT/data/nativetest/ .
ODK tests are in $OUT/data/nativetest/vendor/odk_test. Adding this
path to the list of directories that the script searches through.

Bug: 150158890
Test: Run ./build_and_run_all_tests.sh
Change-Id: Ib3b7d247a5cb86f9972157c13ad60b7f3cbbb7dc
---
 libwvdrmengine/build_and_run_all_unit_tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libwvdrmengine/build_and_run_all_unit_tests.sh b/libwvdrmengine/build_and_run_all_unit_tests.sh
index ca0918cc..eaf8ff1c 100755
--- a/libwvdrmengine/build_and_run_all_unit_tests.sh
+++ b/libwvdrmengine/build_and_run_all_unit_tests.sh
@@ -93,6 +93,8 @@ try_adb_push() {
   # android-tests.zip requires /data/nativetest, we should use the same
   if [ -f $OUT/data/nativetest/$1 ]; then
     test_file=$OUT/data/nativetest/$1
+  elif [ -f $OUT/data/nativetest/vendor/$1/$1 ]; then
+    test_file=$OUT/data/nativetest/vendor/$1/$1
   else
     echo "I cannot find $1"
     echo "I think it should be in $OUT/data/nativetest"