Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: c4804925ed am: 97698623e6 am: d8454fdc54

Change-Id: I8eaaf6690d0aec26b5a59eb6737120eb75a2c156
This commit is contained in:
Automerger Merge Worker
2020-02-28 00:40:31 +00:00

View File

@@ -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"