mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-24 06:02:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6248 from gilles-peskine-arm/all-sh-force-3.2

Browse Source 
Fix all.sh --force
This commit is contained in:
Gilles Peskine 2022-09-23 17:04:00 +02:00 committed by GitHub
commit f70f4ead7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/scripts/all.sh
View File

@ -120,6 +120,9 @@
# Treat uninitialised variables as errors. # Treat uninitialised variables as errors.
set -e -o pipefail -u set -e -o pipefail -u
# Enable ksh/bash extended file matching patterns
shopt -s extglob
pre_check_environment () { pre_check_environment () {
if [ -d library -a -d include -a -d tests ]; then :; else if [ -d library -a -d include -a -d tests ]; then :; else
echo "Must be run from mbed TLS root" >&2 echo "Must be run from mbed TLS root" >&2
@ -295,7 +298,7 @@ cleanup()
-iname CMakeCache.txt -o \ -iname CMakeCache.txt -o \
-path './cmake/*.cmake' \) -exec rm -f {} \+ -path './cmake/*.cmake' \) -exec rm -f {} \+
# Recover files overwritten by in-tree CMake builds # Recover files overwritten by in-tree CMake builds
rm -f include/Makefile include/mbedtls/Makefile programs/*/Makefile rm -f include/Makefile include/mbedtls/Makefile programs/!(fuzz)/Makefile
# Remove any artifacts from the component_test_cmake_as_subdirectory test. # Remove any artifacts from the component_test_cmake_as_subdirectory test.
rm -rf programs/test/cmake_subproject/build rm -rf programs/test/cmake_subproject/build
@ -314,7 +317,9 @@ cleanup()
# Restore files that may have been clobbered by the job # Restore files that may have been clobbered by the job
for x in $files_to_back_up; do for x in $files_to_back_up; do
if [[ -e "$x$backup_suffix" ]]; then
cp -p "$x$backup_suffix" "$x" cp -p "$x$backup_suffix" "$x"
fi
done done
} }