From 00de2fd3ddc73f3eef4fde187c33c93b54ea5867 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Wed, 21 Mar 2018 12:16:57 +0100
Subject: [PATCH] all.sh: fix cleanup happening during an out-of-tree build

---
 tests/scripts/all.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 96b33a15e..312ca82c4 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -131,6 +131,10 @@ EOF
 # remove built files as well as the cmake cache/config
 cleanup()
 {
+    if [ -n "${MBEDTLS_ROOT_DIR+set}" ]; then
+        cd "$MBEDTLS_ROOT_DIR"
+    fi
+
     command make clean
 
     # Remove CMake artefacts
@@ -699,6 +703,7 @@ msg "test: cmake 'out-of-source' build"
 make test
 cd "$MBEDTLS_ROOT_DIR"
 rm -rf "$OUT_OF_SOURCE_DIR"
+unset MBEDTLS_ROOT_DIR