diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2019-10-16 15:14:14 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2019-10-16 15:14:14 -0400 |
| commit | 3e171d51f767a5c4b2f7efe5cc4ad5fc050b3623 (patch) | |
| tree | a37002e4319c3e7c134db978493198318b95da0f | |
| parent | 8de7378919a5dd528eab5c8308d874366d4a1bcc (diff) | |
| download | cryptopp-git-3e171d51f767a5c4b2f7efe5cc4ad5fc050b3623.tar.gz | |
Fix cryptest-android.sh and cryptest-ios.sh
The test programs were ignoring PLATFORM in the environment, and testing all platforms
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | TestScripts/cryptest-android.sh | 8 | ||||
| -rwxr-xr-x | TestScripts/cryptest-ios.sh | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index a1cba871..30c20842 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,11 +191,6 @@ branches: addons:
sonarcloud: false
- coverity_scan:
- project:
- name: "cryptopp"
- build_command: "make -j 2"
-
notifications:
email:
recipients:
diff --git a/TestScripts/cryptest-android.sh b/TestScripts/cryptest-android.sh index 1cb2e08e..1712031b 100755 --- a/TestScripts/cryptest-android.sh +++ b/TestScripts/cryptest-android.sh @@ -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 - diff --git a/TestScripts/cryptest-ios.sh b/TestScripts/cryptest-ios.sh index 8b1cc572..e2fca9a1 100755 --- a/TestScripts/cryptest-ios.sh +++ b/TestScripts/cryptest-ios.sh @@ -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 - |