commit d4c9a38e5895661dca2bd3f408a061c53c7ddb6e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 03 10:34:12 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 03 10:34:12 2020 +0000
tree 25aae2cebb28b1923b74c2bffa334621eb7fad84
parent c35ad48f4109456cc3c4648d3e646ddb70e3f99f
parent 25834799c90bb653fed6cf267acca97f31bea2eb

Merge "Add option to skip build of tests"

build_and_run_benchmark.sh

diff --git a/build_and_run_benchmark.sh b/build_and_run_benchmark.sh
index 7cf7f3b..b1ccec7 100755
--- a/build_and_run_benchmark.sh
+++ b/build_and_run_benchmark.sh
@@ -7,13 +7,14 @@
 # which is not logged.
 
 
-OPTS="$(getopt -o f:r -l filter-driver:,include-nnapi-reference,nnapi-reference-only -- "$@")"
+OPTS="$(getopt -o f:rb -l filter-driver:,include-nnapi-reference,nnapi-reference-only,skip-build -- "$@")"
 
 if [ $? -ne 0 ]; then
     echo "Invalid arguments, accepted options are"
     echo " -f <regex> | --filter-driver <regex> : to run crash tests only on the drivers (ignoring nnapi-reference) matching the specified regular expression"
     echo " -r | --include-nnapi-reference : to include nnapi-reference in target drivers"
     echo " --nnapi-reference-only : to run tests only vs nnapi-reference"
+    echo " -b | --skip-build : skip build and installation of tests"
     exit
 fi
 
@@ -21,6 +22,7 @@
 
 DRIVER_FILTER_OPT=""
 INCLUDE_NNAPI_REF_OPT=""
+BUILD_AND_INSTALL=true
 while [ $# -gt 0 ] ; do
   case "$1" in
     -f|--filter-driver)
@@ -36,6 +38,10 @@
       INCLUDE_NNAPI_REF_OPT="-e nnCrashtestIncludeNnapiReference true"
       shift
       ;;
+    -b|--skip-build)
+      BUILD_AND_INSTALL=false
+      shift
+      ;;
     --)
       shift
       break
@@ -114,23 +120,25 @@
 set -e
 cd $ANDROID_BUILD_TOP
 
-# Build and install benchmark app
-TMPFILE=$(mktemp)
-build/soong/soong_ui.bash --make-mode ${APP}  2>&1 | tee ${TMPFILE}
-TARGET_ARCH=$(cat ${TMPFILE} | grep TARGET_ARCH= | sed -e 's/TARGET_ARCH=//')
-if [ "${TARGET_ARCH}" = "aarch64" ]; then
-    APK_DIR=arm64
-else
-    APK_DIR=${TARGET_ARCH}
-fi
-if ! adb install -r $OUT/testcases/${APP}/${APK_DIR}/${APP}.apk; then
-  adb uninstall com.android.nn.benchmark.app
-  adb install -r $OUT/testcases/${APP}/${APK_DIR}/${APP}.apk
-fi
+if [ "$BUILD_AND_INSTALL" = true ]; then
+  # Build and install benchmark app
+  TMPFILE=$(mktemp)
+  build/soong/soong_ui.bash --make-mode ${APP} 2>&1 | tee ${TMPFILE}
+  TARGET_ARCH=$(cat ${TMPFILE} | grep TARGET_ARCH= | sed -e 's/TARGET_ARCH=//')
+  if [ "${TARGET_ARCH}" = "aarch64" ]; then
+      APK_DIR=arm64
+  else
+      APK_DIR=${TARGET_ARCH}
+  fi
+  if ! adb install -r $OUT/testcases/${APP}/${APK_DIR}/${APP}.apk; then
+    adb uninstall com.android.nn.benchmark.app
+    adb install -r $OUT/testcases/${APP}/${APK_DIR}/${APP}.apk
+  fi
 
-if [ "$INSTALL_NATIVE_TESTS" = true ]; then
-  build/soong/soong_ui.bash --make-mode nn_stress_test
-  adb push $OUT/system/bin/nn_stress_test /bin/
+  if [ "$INSTALL_NATIVE_TESTS" = true ]; then
+    build/soong/soong_ui.bash --make-mode nn_stress_test
+    adb push $OUT/system/bin/nn_stress_test /bin/
+  fi
 fi
 
 # Should we figure out if we run on release device