Move WV unit/integration tests to /data/nativetest

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

The tests currently get copied to /data/bin. Changes in location
of system libraries causes test failures when tests are unable to
find dependent dynamic libraries.

Bug: 123879070
Test: WV unit/integration tests
Change-Id: I86edbe33b4753238fcf8b84243ac6e6c058ea145
This commit is contained in:
Rahul Frias
2019-02-21 01:28:48 -08:00
parent 007153889e
commit 088c5afa02
8 changed files with 30 additions and 30 deletions

View File

@@ -64,19 +64,19 @@ fi
# Push the files to the device
# Given a local path to a file, this will try to push it to /data/bin.
# Given a local path to a file, this will try to push it to /data/nativetest.
# If that fails, an error message will be printed.
try_adb_push() {
# android-tests.zip requires /data/bin, we should use the same
if [ -f $OUT/data/bin/$1 ]; then
test_file=$OUT/data/bin/$1
# android-tests.zip requires /data/nativetest, we should use the same
if [ -f $OUT/data/nativetest/$1 ]; then
test_file=$OUT/data/nativetest/$1
else
echo "I cannot find $1"
echo "I think it should be in $OUT/data/bin"
echo "I think it should be in $OUT/data/nativetest"
exit 1
fi
adb $SERIAL_NUM shell mkdir -p /data/bin
adb $SERIAL_NUM push $test_file /data/bin/$1
adb $SERIAL_NUM shell mkdir -p /data/nativetest
adb $SERIAL_NUM push $test_file /data/nativetest/$1
}
# Push the tests to the device