Docker: really cleanup when TOPOTEST_CLEAN is specified

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

diff --git a/tests/topotests/docker/compile_frr.sh b/tests/topotests/docker/compile_frr.sh
index 6b64f79d6077a530dfc3f60ea1ff4c77842df2b5..579994f83dfd5ab65d53820c23826b21e97458a0 100755 (executable)
--- 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