Fix cryptest-android.sh and cryptest-ios.sh

The test programs were ignoring PLATFORM in the environment, and testing all platforms
This commit is contained in:
Jeffrey Walton 2019-10-16 15:14:14 -04:00
parent 8de7378919
commit 3e171d51f7
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 10 additions and 11 deletions

View File

@ -191,11 +191,6 @@ branches:
addons:
sonarcloud: false
coverity_scan:
project:
name: "cryptopp"
build_command: "make -j 2"
notifications:
email:
recipients:

View File

@ -29,11 +29,14 @@ MAKE_JOBS=2
rm -rf "$TMPDIR/build.failed" 2>/dev/null
rm -rf "$TMPDIR/build.log" 2>/dev/null
# Accept user supplied platforms
if [ "$#" -gt 0 ]; then
# Accept platforms on the command line
PLATFORMS=("$@")
echo "User specified platforms $@."
elif [ -n "$PLATFORM" ]; then
# Accept platforms in the environment
PLATFORMS=("$PLATFORM")
else
# Use all platforms
PLATFORMS=(armeabi-v7a arm64-v8a x86 x86_64)
fi
@ -90,4 +93,3 @@ if [ -f "$TMPDIR/build.failed" ]; then
fi
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 0 || return 0

View File

@ -27,11 +27,14 @@ MAKE_JOBS=2
rm -rf "$TMPDIR/build.failed" 2>/dev/null
rm -rf "$TMPDIR/build.log" 2>/dev/null
# Accept user supplied platforms
if [ "$#" -gt 0 ]; then
# Accept platforms on the command line
PLATFORMS=("$@")
echo "User specified platforms $@."
elif [ -n "$PLATFORM" ]; then
# Accept platforms in the environment
PLATFORMS=("$PLATFORM")
else
# Use all platforms
PLATFORMS=(iPhoneOS iPhoneSimulator Arm64 WatchOS WatchSimulator AppleTVOS AppleTVSimulator)
fi
@ -79,4 +82,3 @@ if [ -f "$TMPDIR/build.failed" ]; then
fi
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 0 || return 0