Shellcheck warnings addressed
SC2236: use [[ -n "$var" ]] instead of [[ ! -z "$var" ]]
SC2035: use -- end of options, to accomodate filename w\ hyphens
SC2155: `local -r var=..` for readonly variable shellcheck ignores return value masking
SC2045: prefer glob to iteration over `ls`
Bug: N/A
Test: ran ./run_intergration_tests.sh
Change-Id: Iaf313857ecc417e855afd70c7455841b54b1c363
diff --git a/tests/androidmk_test.sh b/tests/androidmk_test.sh
index 331dc77..d0d382b 100755
--- a/tests/androidmk_test.sh
+++ b/tests/androidmk_test.sh
@@ -5,7 +5,7 @@
# How to run: bash path-to-script/androidmk_test.sh
# Tests of converting license functionality of the androidmk tool
REAL_TOP="$(readlink -f "$(dirname "$0")"/../../..)"
-$REAL_TOP/build/soong/soong_ui.bash --make-mode androidmk
+"$REAL_TOP/build/soong/soong_ui.bash" --make-mode androidmk
source "$(dirname "$0")/lib.sh"
@@ -113,11 +113,14 @@
run_androidmk_test "a/b/c/d/Android.mk" "a/b/c/d/Android.bp"
}
-run_androidmk_test () {
+function run_androidmk_test {
export ANDROID_BUILD_TOP="$MOCK_TOP"
-
- local out=$($REAL_TOP/*/host/*/bin/androidmk "$1")
- local expected=$(<"$2")
+ local -r androidmk=("$REAL_TOP"/*/host/*/bin/androidmk)
+ if [[ ${#androidmk[@]} -ne 1 ]]; then
+ fail "Multiple androidmk binaries found: ${androidmk[*]}"
+ fi
+ local -r out=$("${androidmk[0]}" "$1")
+ local -r expected=$(<"$2")
if [[ "$out" != "$expected" ]]; then
ANDROID_BUILD_TOP="$REAL_TOP"