Merge "Search for test executables in odk_test" into rvc-dev

2020-02-27 23:47:56 +00:00
parent 0947bd185b 19605579d5
commit 6373ff35ca
1 changed files with 2 additions and 0 deletions
--- 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"