From 7b972148228526c84cb6d5955b64a28ff887761d Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 7 Feb 2021 06:31:33 -0500 Subject: Update test scripts --- .travis.yml | 18 +++++++++--------- TestScripts/cryptest-android.sh | 8 ++++---- TestScripts/cryptest-ndk.sh | 8 ++++---- TestScripts/install-ndk.sh | 8 ++++---- TestScripts/setenv-android.sh | 8 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index be606b1a..fb5fc54c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -472,8 +472,8 @@ jobs: - BUILD_MODE=android - ANDROID_CPU=armv7a - ANDROID_API=23 - - ANDROID_SDK_ROOT="$HOME/android-sdk" - - ANDROID_NDK_ROOT="$HOME/android-ndk" + - ANDROID_SDK_ROOT="/opt/android-sdk" + - ANDROID_NDK_ROOT="/opt/android-ndk" - name: Android, aarch64, Linux os: linux arch: amd64 @@ -482,8 +482,8 @@ jobs: - BUILD_MODE=android - ANDROID_CPU=aarch64 - ANDROID_API=23 - - ANDROID_SDK_ROOT="$HOME/android-sdk" - - ANDROID_NDK_ROOT="$HOME/android-ndk" + - ANDROID_SDK_ROOT="/opt/android-sdk" + - ANDROID_NDK_ROOT="/opt/android-ndk" - name: Android, x86, Linux os: linux arch: amd64 @@ -492,8 +492,8 @@ jobs: - BUILD_MODE=android - ANDROID_CPU=x86 - ANDROID_API=23 - - ANDROID_SDK_ROOT="$HOME/android-sdk" - - ANDROID_NDK_ROOT="$HOME/android-ndk" + - ANDROID_SDK_ROOT="/opt/android-sdk" + - ANDROID_NDK_ROOT="/opt/android-ndk" - name: Android, x86_64, Linux os: linux arch: amd64 @@ -502,8 +502,8 @@ jobs: - BUILD_MODE=android - ANDROID_CPU=x86_64 - ANDROID_API=23 - - ANDROID_SDK_ROOT="$HOME/android-sdk" - - ANDROID_NDK_ROOT="$HOME/android-ndk" + - ANDROID_SDK_ROOT="/opt/android-sdk" + - ANDROID_NDK_ROOT="/opt/android-ndk" - name: iPhoneOS, armv7, iOS os: osx osx_image: xcode10.1 @@ -595,7 +595,7 @@ before_install: # https://github.com/travis-ci/travis-ci/issues/9037 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145 sudo apt-get -qq -y update - bash TestScripts/install-ndk.sh + sudo -E TestScripts/install-ndk.sh fi if [[ "$BUILD_OS" == "linux" ]] && [[ "$BUILD_MODE" == "autotools" ]]; then # https://github.com/travis-ci/travis-ci/issues/9037 diff --git a/TestScripts/cryptest-android.sh b/TestScripts/cryptest-android.sh index 7bce8c98..99829ba9 100755 --- a/TestScripts/cryptest-android.sh +++ b/TestScripts/cryptest-android.sh @@ -22,15 +22,15 @@ fi # Error checking if [ ! -d "${ANDROID_NDK_ROOT}" ]; then - echo "ERROR: ANDROID_NDK_ROOT is not a valid path. Please set it." - echo "ANDROID_NDK_ROOT is ${ANDROID_NDK_ROOT}" + echo "ERROR: ANDROID_NDK_ROOT is not a valid path for ${USER}. Please set it." + echo "ANDROID_NDK_ROOT is '${ANDROID_NDK_ROOT}'" exit 1 fi # Error checking if [ ! -d "${ANDROID_SDK_ROOT}" ]; then - echo "ERROR: ANDROID_SDK_ROOT is not a valid path. Please set it." - echo "ANDROID_SDK_ROOT is ${ANDROID_SDK_ROOT}" + echo "ERROR: ANDROID_SDK_ROOT is not a valid path for ${USER}. Please set it." + echo "ANDROID_SDK_ROOT is '${ANDROID_SDK_ROOT}'" exit 1 fi diff --git a/TestScripts/cryptest-ndk.sh b/TestScripts/cryptest-ndk.sh index 7ea5b4f0..54459f95 100755 --- a/TestScripts/cryptest-ndk.sh +++ b/TestScripts/cryptest-ndk.sh @@ -16,15 +16,15 @@ # Error checking if [ ! -d "${ANDROID_NDK_ROOT}" ]; then - echo "ERROR: ANDROID_NDK_ROOT is not a valid path. Please set it." - echo "ANDROID_NDK_ROOT is ${ANDROID_NDK_ROOT}" + echo "ERROR: ANDROID_NDK_ROOT is not a valid path for ${USER}. Please set it." + echo "ANDROID_NDK_ROOT is '${ANDROID_NDK_ROOT}'" exit 1 fi # Error checking if [ ! -d "${ANDROID_SDK_ROOT}" ]; then - echo "ERROR: ANDROID_SDK_ROOT is not a valid path. Please set it." - echo "ANDROID_SDK_ROOT is ${ANDROID_SDK_ROOT}" + echo "ERROR: ANDROID_SDK_ROOT is not a valid path for ${USER}. Please set it." + echo "ANDROID_SDK_ROOT is '${ANDROID_SDK_ROOT}'" exit 1 fi diff --git a/TestScripts/install-ndk.sh b/TestScripts/install-ndk.sh index ce6bb9e6..88d42fb3 100755 --- a/TestScripts/install-ndk.sh +++ b/TestScripts/install-ndk.sh @@ -36,14 +36,14 @@ # Windows: https://dl.google.com/android/repository/platform-tools-latest-windows.zip if [ -z "${ANDROID_SDK_ROOT}" ]; then - echo "ERROR: ANDROID_SDK_ROOT is not set. Please set it." - echo "SDK root is ${ANDROID_SDK_ROOT}" + echo "ERROR: ANDROID_SDK_ROOT is not set for ${USER}. Please set it." + echo "ANDROID_SDK_ROOT is '${ANDROID_SDK_ROOT}'" exit 1 fi if [ -z "${ANDROID_NDK_ROOT}" ]; then - echo "ERROR: ANDROID_NDK_ROOT is not set. Please set it." - echo "NDK root is ${ANDROID_NDK_ROOT}" + echo "ERROR: ANDROID_NDK_ROOT is not set for ${USER}. Please set it." + echo "ANDROID_NDK_ROOT '${ANDROID_NDK_ROOT}'" exit 1 fi diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh index ad31c15a..73aaf158 100755 --- a/TestScripts/setenv-android.sh +++ b/TestScripts/setenv-android.sh @@ -103,15 +103,15 @@ fi # Error checking if [ ! -d "${ANDROID_NDK_ROOT}" ]; then - echo "ERROR: ANDROID_NDK_ROOT is not a valid path. Please set it." - echo "ANDROID_NDK_ROOT is ${ANDROID_NDK_ROOT}" + echo "ERROR: ANDROID_NDK_ROOT is not a valid path for ${USER}. Please set it." + echo "ANDROID_NDK_ROOT is '${ANDROID_NDK_ROOT}'" [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1 fi # Error checking if [ ! -d "${ANDROID_SDK_ROOT}" ]; then - echo "ERROR: ANDROID_SDK_ROOT is not a valid path. Please set it." - echo "ANDROID_SDK_ROOT is ${ANDROID_SDK_ROOT}" + echo "ERROR: ANDROID_SDK_ROOT is not a valid path for ${USER}. Please set it." + echo "ANDROID_SDK_ROOT is '${ANDROID_SDK_ROOT}'" [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1 fi -- cgit v1.2.1