yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-11 01:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream-public/pr/1486' into development-proposed

Browse source
This commit is contained in:
Jaeden Amero 2018-05-04 11:03:16 +01:00
parent 070e356476 38d8165865
commit 09c4e7ef5a
2 changed files with 39 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/output_env.sh
View file

@ -47,13 +47,15 @@ print_version()
print_version "uname" "-a" "" print_version "uname" "-a" ""
echo echo
: ${ARMC5_CC:=armcc} if [ "${RUN_ARMCC:-1}" -ne 0 ]; then
print_version "$ARMC5_CC" "--vsn" "armcc not found!" "head -n 2" : "${ARMC5_CC:=armcc}"
echo print_version "$ARMC5_CC" "--vsn" "armcc not found!" "head -n 2"
echo
: ${ARMC6_CC:=armclang} : "${ARMC6_CC:=armclang}"
print_version "$ARMC6_CC" "--vsn" "armclang not found!" "head -n 2" print_version "$ARMC6_CC" "--vsn" "armclang not found!" "head -n 2"
echo echo
fi
print_version "arm-none-eabi-gcc" "--version" "gcc-arm not found!" "head -n 1" print_version "arm-none-eabi-gcc" "--version" "gcc-arm not found!" "head -n 1"
echo echo

107
tests/scripts/all.sh
View file

@ -94,7 +94,6 @@ CONFIG_BAK="$CONFIG_H.bak"
MEMORY=0 MEMORY=0
FORCE=0 FORCE=0
KEEP_GOING=0 KEEP_GOING=0
RELEASE=0
RUN_ARMCC=1 RUN_ARMCC=1
YOTTA=1 YOTTA=1
@ -126,8 +125,12 @@ General options:
-m|--memory Additional optional memory tests. -m|--memory Additional optional memory tests.
--armcc Run ARM Compiler builds (on by default). --armcc Run ARM Compiler builds (on by default).
--no-armcc Skip ARM Compiler builds. --no-armcc Skip ARM Compiler builds.
--no-force Refuse to overwrite modified files (default).
--no-keep-going Stop at the first error (default).
--no-memory No additional memory tests (default).
--no-yotta Skip yotta module build. --no-yotta Skip yotta module build.
--out-of-source-dir=<path> Directory used for CMake out-of-source build tests. --out-of-source-dir=<path> Directory used for CMake out-of-source build tests.
--random-seed Use a random seed value for randomized tests (default).
-r|--release-test Run this script in release mode. This fixes the seed value to 1. -r|--release-test Run this script in release mode. This fixes the seed value to 1.
-s|--seed Integer seed value to use for this test run. -s|--seed Integer seed value to use for this test run.
--yotta Build yotta module (on by default). --yotta Build yotta module (on by default).
@ -214,74 +217,29 @@ check_tools()
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
--armcc) --armcc) RUN_ARMCC=1;;
RUN_ARMCC=1 --armc5-bin-dir) shift; ARMC5_BIN_DIR="$1";;
;; --armc6-bin-dir) shift; ARMC6_BIN_DIR="$1";;
--armc5-bin-dir) --force|-f) FORCE=1;;
shift --gnutls-cli) shift; GNUTLS_CLI="$1";;
ARMC5_BIN_DIR="$1" --gnutls-legacy-cli) shift; GNUTLS_LEGACY_CLI="$1";;
;; --gnutls-legacy-serv) shift; GNUTLS_LEGACY_SERV="$1";;
--armc6-bin-dir) --gnutls-serv) shift; GNUTLS_SERV="$1";;
shift --help|-h) usage; exit;;
ARMC6_BIN_DIR="$1" --keep-going|-k) KEEP_GOING=1;;
;; --memory|-m) MEMORY=1;;
--force|-f) --no-armcc) RUN_ARMCC=0;;
FORCE=1 --no-force) FORCE=0;;
;; --no-keep-going) KEEP_GOING=0;;
--gnutls-cli) --no-memory) MEMORY=0;;
shift --no-yotta) YOTTA=0;;
GNUTLS_CLI="$1" --openssl) shift; OPENSSL="$1";;
;; --openssl-legacy) shift; OPENSSL_LEGACY="$1";;
--gnutls-legacy-cli) --out-of-source-dir) shift; OUT_OF_SOURCE_DIR="$1";;
shift --random-seed) unset SEED;;
GNUTLS_LEGACY_CLI="$1" --release-test|-r) SEED=1;;
;; --seed|-s) shift; SEED="$1";;
--gnutls-legacy-serv) --yotta) YOTTA=1;;
shift
GNUTLS_LEGACY_SERV="$1"
;;
--gnutls-serv)
shift
GNUTLS_SERV="$1"
;;
--help|-h)
usage
exit
;;
--keep-going|-k)
KEEP_GOING=1
;;
--memory|-m)
MEMORY=1
;;
--no-armcc)
RUN_ARMCC=0
;;
--no-yotta)
YOTTA=0
;;
--openssl)
shift
OPENSSL="$1"
;;
--openssl-legacy)
shift
OPENSSL_LEGACY="$1"
;;
--out-of-source-dir)
shift
OUT_OF_SOURCE_DIR="$1"
;;
--release-test|-r)
RELEASE=1
;;
--seed|-s)
shift
SEED="$1"
;;
--yotta)
YOTTA=1
;;
*) *)
echo >&2 "Unknown option: $1" echo >&2 "Unknown option: $1"
echo >&2 "Run $0 --help for usage." echo >&2 "Run $0 --help for usage."
@ -386,11 +344,6 @@ if_build_succeeded () {
fi fi
} }
if [ $RELEASE -eq 1 ]; then
# Fix the seed value to 1 to ensure that the tests are deterministic.
SEED=1
fi
msg "info: $0 configuration" msg "info: $0 configuration"
echo "MEMORY: $MEMORY" echo "MEMORY: $MEMORY"
echo "FORCE: $FORCE" echo "FORCE: $FORCE"
@ -416,7 +369,9 @@ export GNUTLS_CLI="$GNUTLS_CLI"
export GNUTLS_SERV="$GNUTLS_SERV" export GNUTLS_SERV="$GNUTLS_SERV"
# Avoid passing --seed flag in every call to ssl-opt.sh # Avoid passing --seed flag in every call to ssl-opt.sh
[ ! -z ${SEED+set} ] && export SEED if [ -n "${SEED-}" ]; then
export SEED
fi
# Make sure the tools we need are available. # Make sure the tools we need are available.
check_tools "$OPENSSL" "$OPENSSL_LEGACY" "$GNUTLS_CLI" "$GNUTLS_SERV" \ check_tools "$OPENSSL" "$OPENSSL_LEGACY" "$GNUTLS_CLI" "$GNUTLS_SERV" \
@ -447,7 +402,7 @@ msg "info: output_env.sh"
OPENSSL="$OPENSSL" OPENSSL_LEGACY="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_CLI" \ OPENSSL="$OPENSSL" OPENSSL_LEGACY="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_CLI" \
GNUTLS_SERV="$GNUTLS_SERV" GNUTLS_LEGACY_CLI="$GNUTLS_LEGACY_CLI" \ GNUTLS_SERV="$GNUTLS_SERV" GNUTLS_LEGACY_CLI="$GNUTLS_LEGACY_CLI" \
GNUTLS_LEGACY_SERV="$GNUTLS_LEGACY_SERV" ARMC5_CC="$ARMC5_CC" \ GNUTLS_LEGACY_SERV="$GNUTLS_LEGACY_SERV" ARMC5_CC="$ARMC5_CC" \
ARMC6_CC="$ARMC6_CC" scripts/output_env.sh ARMC6_CC="$ARMC6_CC" RUN_ARMCC="$RUN_ARMCC" scripts/output_env.sh
msg "test: recursion.pl" # < 1s msg "test: recursion.pl" # < 1s
tests/scripts/recursion.pl library/*.c tests/scripts/recursion.pl library/*.c