From 1ab13617bfdf6f15a307345d3ceb3533aaca72bd Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Thu, 18 Oct 2018 12:27:16 +0200 Subject: [PATCH] Docker: really cleanup when TOPOTEST_CLEAN is specified Signed-off-by: Christian Franke --- tests/topotests/docker/compile_frr.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/topotests/docker/compile_frr.sh b/tests/topotests/docker/compile_frr.sh index 6b64f79d60..579994f83d 100755 --- a/tests/topotests/docker/compile_frr.sh +++ b/tests/topotests/docker/compile_frr.sh @@ -32,6 +32,11 @@ CDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Script begin # +if [ "${TOPOTEST_CLEAN}" != "0" ]; then + log_info "Cleaning FRR builddir..." + rm -rf $FRR_SYNC_DIR $FRR_BUILD_DIR &> /dev/null +fi + log_info "Syncing FRR source with host..." mkdir -p $FRR_SYNC_DIR rsync -a --info=progress2 \ @@ -52,11 +57,6 @@ else exec 3>/dev/null fi -if [ "${TOPOTEST_CLEAN}" != "0" ]; then - log_info "Cleaning FRR builddir..." - git clean -xdf > /dev/null -fi - log_info "Building FRR..." if [ ! -e configure ]; then -- 2.39.5