From 14a5617b709e41f3b27e24fe080a24a8b8d19056 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 18 Oct 2020 14:21:26 -0700
Subject: [PATCH] scripts: move android_tests into a new script

android_tests is only useful for local testing, and it wasn't being run
in Travis CI.  Move it into a separate script to avoid complicating
run_tests.sh.
---
 scripts/android_tests.sh | 62 ++++++++++++++++++++++++++++++++++++
 scripts/exec_tests.sh    |  3 +-
 scripts/run_tests.sh     | 68 +---------------------------------------
 3 files changed, 65 insertions(+), 68 deletions(-)
 create mode 100644 scripts/android_tests.sh

diff --git a/scripts/android_tests.sh b/scripts/android_tests.sh
new file mode 100644
index 0000000..380fcd7
--- /dev/null
+++ b/scripts/android_tests.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# Test libdeflate on a connected arm64 Android device.
+# Requires the Android NDK (release 19 or later) and adb.
+
+set -eu -o pipefail
+cd "$(dirname "$0")/.."
+
+if [ $# -ne 0 ]; then
+	echo 1>&2 "Usage: $0"
+	exit 2
+fi
+
+# Use NDKDIR if specified in environment, else use default value.
+: "${NDKDIR:=$HOME/android-ndk-r21d}"
+if [ ! -e "$NDKDIR" ]; then
+	cat 1>&2 << EOF
+Android NDK was not found in NDKDIR=$NDKDIR!  Set the
+environmental variable NDKDIR to the location of your Android NDK installation.
+EOF
+	exit 1
+fi
+
+# Use TESTDATA if specified in environment, else generate it.
+if [ -z "${TESTDATA:-}" ]; then
+	# Generate default TESTDATA file.
+	TESTDATA=$(mktemp -t libdeflate_testdata.XXXXXXX)
+	export TESTDATA
+	trap 'rm -f "$TESTDATA"' EXIT
+	find . '(' -name '*.c' -o -name '*.h' -o -name '*.sh' ')' \
+		-exec cat '{}' ';' | head -c 1000000 > "$TESTDATA"
+fi
+
+# Create a temporary file.
+TMPFILE=$(mktemp -t libdeflate_tmpfile.XXXXXX)
+trap 'rm -f "$TMPFILE"' EXIT
+
+android_build_and_test() {
+	echo "Running Android tests with $*"
+
+	./scripts/android_build.sh --ndkdir="$NDKDIR" "$@" \
+		all test_programs > /dev/null
+	adb push "$TESTDATA" ./scripts/exec_tests.sh benchmark test_* \
+		/data/local/tmp/ > /dev/null
+
+	# Note: adb shell always returns 0, even if the shell command fails...
+	adb shell "cd /data/local/tmp && WRAPPER= TESTDATA=$(basename "$TESTDATA") sh exec_tests.sh" \
+		> "$TMPFILE"
+	if ! grep -q "exec_tests finished successfully" "$TMPFILE"; then
+		echo 1>&2 "Android test failure!  adb shell output:"
+		cat "$TMPFILE"
+		exit 1
+	fi
+}
+
+for arch in arm32 arm64; do
+	android_build_and_test --arch=$arch
+	android_build_and_test --arch=$arch --enable-crc
+	android_build_and_test --arch=$arch --enable-crypto
+	android_build_and_test --arch=$arch --enable-crc --enable-crypto
+done
+echo "Android tests passed"
diff --git a/scripts/exec_tests.sh b/scripts/exec_tests.sh
index 6eb6eba..c748e42 100644
--- a/scripts/exec_tests.sh
+++ b/scripts/exec_tests.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Helper script used by run_tests.sh, not intended to be run directly
+# Helper script used by run_tests.sh and android_tests.sh,
+# not intended to be run directly
 #
 
 set -eu
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index 9134550..d84d7fc 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -33,31 +33,14 @@ if [ $# -gt 0 ]; then
 	set_test_groups "$@"
 fi
 
-
-TMPFILE="$(mktemp)"
-USING_TMP_TESTDATA=false
-
-cleanup() {
-	rm "$TMPFILE"
-	if $USING_TMP_TESTDATA; then
-		rm "$TESTDATA"
-	fi
-}
-
-trap cleanup EXIT
-
 if [ -z "${TESTDATA:-}" ]; then
 	# Generate default TESTDATA file.
 	TESTDATA=$(mktemp -t libdeflate_testdata.XXXXXXXXXX)
-	USING_TMP_TESTDATA=true
+	trap 'rm -f "$TESTDATA"' EXIT
 	cat $(find . -name '*.c' -o -name '*.h' -o -name '*.sh') \
 		| head -c 1000000 > "$TESTDATA"
 fi
 
-NDKDIR="${NDKDIR:=$HOME/android-ndk-r21d}"
-
-FILES=("$TESTDATA" ./scripts/exec_tests.sh benchmark 'test_*')
-EXEC_TESTS_CMD="WRAPPER= TESTDATA=\"$(basename $TESTDATA)\" sh exec_tests.sh"
 NPROC=$(grep -c processor /proc/cpuinfo)
 VALGRIND="valgrind --quiet --error-exitcode=100 --leak-check=full --errors-for-leak-kinds=all"
 SANITIZE_CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer"
@@ -237,53 +220,6 @@ checksum_benchmarks() {
 
 ###############################################################################
 
-android_build_and_test() {
-	run_cmd ./scripts/android_build.sh --ndkdir="$NDKDIR" "$@" \
-		all test_programs
-	run_cmd adb push ${FILES[@]} /data/local/tmp/
-
-	# Note: adb shell always returns 0, even if the shell command fails...
-	log "adb shell \"cd /data/local/tmp && $EXEC_TESTS_CMD\""
-	adb shell "cd /data/local/tmp && $EXEC_TESTS_CMD" > "$TMPFILE"
-	if ! grep -q "exec_tests finished successfully" "$TMPFILE"; then
-		log "Android test failure!  adb shell output:"
-		cat "$TMPFILE"
-		return 1
-	fi
-}
-
-android_tests() {
-	local compiler
-
-	test_group_included android || return 0
-	if [ ! -e $NDKDIR ]; then
-		log_skip "Android NDK was not found in NDKDIR=$NDKDIR!" \
-		         "If you want to run the Android tests, set the" \
-			 "environmental variable NDKDIR to the location of" \
-			 "your Android NDK installation"
-		return 0
-	fi
-
-	if ! type -P adb > /dev/null; then
-		log_skip "adb (android-tools) is not installed"
-		return 0
-	fi
-
-	if ! adb devices | grep -q 'device$'; then
-		log_skip "No Android device is currently attached"
-		return 0
-	fi
-
-	for arch in arm32 arm64; do
-		for flags in "" "--enable-crc" "--enable-crypto" \
-			     "--enable-crc --enable-crypto"; do
-			android_build_and_test --arch=$arch $flags
-		done
-	done
-}
-
-###############################################################################
-
 windows_tests() {
 	local arch
 
@@ -347,12 +283,10 @@ gzip_tests() {
 log "Starting libdeflate tests"
 log "	TESTGROUPS=(${TESTGROUPS[@]})"
 log "	TESTDATA=$TESTDATA"
-log "	NDKDIR=$NDKDIR"
 
 native_tests
 freestanding_tests
 checksum_benchmarks
-android_tests
 windows_tests
 static_analysis_tests
 gzip_tests