yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add --no-yotta option to all.sh

Browse source 
The Yotta tools break in some environments and it's useful to be able
to run the rest of all.sh nonetheless.
This commit is contained in:
Gilles Peskine 2017-11-30 13:22:04 +01:00
parent 832f349f93
commit da519251d4
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/scripts/all.sh
View file

@ -36,6 +36,7 @@ CONFIG_BAK="$CONFIG_H.bak"
MEMORY=0 MEMORY=0
FORCE=0 FORCE=0
RELEASE=0 RELEASE=0
YOTTA=1
# Default commands, can be overriden by the environment # Default commands, can be overriden by the environment
: ${OPENSSL:="openssl"} : ${OPENSSL:="openssl"}
@ -61,6 +62,7 @@ usage()
printf " -f|--force\t\tForce the tests to overwrite any modified files.\n" printf " -f|--force\t\tForce the tests to overwrite any modified files.\n"
printf " -s|--seed\t\tInteger seed value to use for this test run.\n" printf " -s|--seed\t\tInteger seed value to use for this test run.\n"
printf " -r|--release-test\t\tRun this script in release mode. This fixes the seed value to 1.\n" printf " -r|--release-test\t\tRun this script in release mode. This fixes the seed value to 1.\n"
printf " --no-yotta\t\tSkip yotta build\n"
printf " --out-of-source-dir=<path>\t\tDirectory used for CMake out-of-source build tests." printf " --out-of-source-dir=<path>\t\tDirectory used for CMake out-of-source build tests."
printf " --openssl=<OpenSSL_path>\t\tPath to OpenSSL executable to use for most tests.\n" printf " --openssl=<OpenSSL_path>\t\tPath to OpenSSL executable to use for most tests.\n"
printf " --openssl-legacy=<OpenSSL_path>\t\tPath to OpenSSL executable to use for legacy tests e.g. SSLv3.\n" printf " --openssl-legacy=<OpenSSL_path>\t\tPath to OpenSSL executable to use for legacy tests e.g. SSLv3.\n"
@ -138,6 +140,9 @@ while [ $# -gt 0 ]; do
--release-test|-r) --release-test|-r)
RELEASE=1 RELEASE=1
;; ;;
--no-yotta)
YOTTA=0
;;
--out-of-source-dir) --out-of-source-dir)
shift shift
OUT_OF_SOURCE_DIR="$1" OUT_OF_SOURCE_DIR="$1"
@ -183,12 +188,14 @@ while [ $# -gt 0 ]; do
done done
if [ $FORCE -eq 1 ]; then if [ $FORCE -eq 1 ]; then
rm -rf yotta/module "$OUT_OF_SOURCE_DIR" if [ $YOTTA -eq 1 ]; then
rm -rf yotta/module "$OUT_OF_SOURCE_DIR"
fi
git checkout-index -f -q $CONFIG_H git checkout-index -f -q $CONFIG_H
cleanup cleanup
else else
if [ -d yotta/module ]; then if [ $YOTTA -eq 1 ] && [ -d yotta/module ]; then
err_msg "Warning - there is an existing yotta module in the directory 'yotta/module'" err_msg "Warning - there is an existing yotta module in the directory 'yotta/module'"
echo "You can either delete your work and retry, or force the test to overwrite the" echo "You can either delete your work and retry, or force the test to overwrite the"
echo "test by rerunning the script as: $0 --force" echo "test by rerunning the script as: $0 --force"
@ -283,11 +290,13 @@ msg "test: doxygen warnings" # ~ 3s
cleanup cleanup
tests/scripts/doxygen.sh tests/scripts/doxygen.sh
# Note - use of yotta is deprecated, and yotta also requires armcc to be on the if [ $YOTTA -ne 0 ]; then
# path, and uses whatever version of armcc it finds there. # Note - use of yotta is deprecated, and yotta also requires armcc to be
msg "build: create and build yotta module" # ~ 30s # on the path, and uses whatever version of armcc it finds there.
cleanup msg "build: create and build yotta module" # ~ 30s
tests/scripts/yotta-build.sh cleanup
tests/scripts/yotta-build.sh
fi
msg "build: cmake, gcc, ASan" # ~ 1 min 50s msg "build: cmake, gcc, ASan" # ~ 1 min 50s
cleanup cleanup