From 1c582c3b8beae0aa6457650f2fd02baecb705076 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Tue, 25 Jun 2019 21:55:21 +0200 Subject: [PATCH] Restore tests/fuzz/Makefile after in-tree cmake Save and restore the Makefile in tests/fuzz like the other makefiles. --- tests/scripts/all.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index ca826b0b9..46107c923 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -24,7 +24,8 @@ # configurations, and can and will arbitrarily change the current CMake # configuration. The following files must be committed into git: # * include/mbedtls/config.h -# * Makefile, library/Makefile, programs/Makefile, tests/Makefile +# * Makefile, library/Makefile, programs/Makefile, tests/Makefile, +# tests/fuzz/Makefile # After running this script, the CMake cache will be lost and CMake # will no longer be initialised. # @@ -75,9 +76,9 @@ # * Run `make clean`. # * Restore `include/mbedtks/config.h` from a backup made before running # the component. -# * Check out `Makefile`, `library/Makefile`, `programs/Makefile` and -# `tests/Makefile` from git. This cleans up after an in-tree use of -# CMake. +# * Check out `Makefile`, `library/Makefile`, `programs/Makefile`, +# `tests/Makefile` and `tests/fuzz/Makefile` from git. +# This cleans up after an in-tree use of CMake. # # Any command that is expected to fail must be protected so that the # script keeps running in --keep-going mode despite `set -e`. In keep-going @@ -234,8 +235,8 @@ cleanup() -iname CMakeCache.txt \) -exec rm {} \+ # Recover files overwritten by in-tree CMake builds rm -f include/Makefile include/mbedtls/Makefile programs/*/Makefile - git update-index --no-skip-worktree Makefile library/Makefile programs/Makefile tests/Makefile - git checkout -- Makefile library/Makefile programs/Makefile tests/Makefile + git update-index --no-skip-worktree Makefile library/Makefile programs/Makefile tests/Makefile tests/fuzz/Makefile + git checkout -- Makefile library/Makefile programs/Makefile tests/Makefile tests/fuzz/Makefile cd crypto rm -f include/Makefile include/mbedtls/Makefile programs/*/Makefile git update-index --no-skip-worktree Makefile library/Makefile programs/Makefile tests/Makefile