widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix LD_LIBRARY_PATH in run_all_unit_test.sh

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/75383

Because the tests need to find liboemcrypto.so.

Bug: 129354680
Test: ran on taimen and bonito.
Change-Id: I9cc802a2396937739b164851f51726fbc80550d5
This commit is contained in:
Fred Gylys-Colwell
2019-03-26 14:29:06 -07:00
parent a45deef63b
commit dd64dedb51
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/run_all_unit_tests.sh
View File

@@ -26,6 +26,9 @@ elif [ 0 -eq `expr index "$GTEST_FILTER" "-"` ]; then
GTEST_FILTER="$GTEST_FILTER-" GTEST_FILTER="$GTEST_FILTER-"
fi fi
# The Android supplement allows for installation in these paths:
OEC_PATHS=/vendor/lib64:/vendor/lib
# Execute a command in "adb shell" and capture the result. # Execute a command in "adb shell" and capture the result.
adb_shell_run() { adb_shell_run() {
local test_file=$1 local test_file=$1
@@ -40,7 +43,7 @@ adb_shell_run() {
echo "------ Starting: $test_file" echo "------ Starting: $test_file"
local tmp_log="$OUT/mediadrmtest.log" local tmp_log="$OUT/mediadrmtest.log"
local adb_error="[ADB SHELL] $@ $test_file failed" local adb_error="[ADB SHELL] $@ $test_file failed"
adb $SERIAL_NUM shell "GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log" adb $SERIAL_NUM shell "LD_LIBRARY_PATH=$OEC_PATHS GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log"
! grep -Fq "$adb_error" "$tmp_log" ! grep -Fq "$adb_error" "$tmp_log"
local result=$? local result=$?
if [ $result -ne 0 ]; then if [ $result -ne 0 ]; then