mirror of
https://github.com/espressif/mbedtls.git
synced 2025-05-12 05:03:00 +08:00
Merge pull request #6309 from gilles-peskine-arm/all-sh-force-2.28
Backport 2.28: Fix all.sh --force
This commit is contained in:
commit
662b301c27
@ -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
|
||||||
@ -294,7 +297,7 @@ cleanup()
|
|||||||
-iname CTestTestfile.cmake -o \
|
-iname CTestTestfile.cmake -o \
|
||||||
-iname CMakeCache.txt \) -exec rm {} \+
|
-iname CMakeCache.txt \) -exec rm {} \+
|
||||||
# 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
|
||||||
@ -303,7 +306,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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user