From d88ae88b341752efa3cc360417316dddb132a581 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Fri, 21 Jan 2022 19:43:17 -0800
Subject: [PATCH] Fix e2e, dropped 'finish()' func

---
 test_e2e.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test_e2e.sh b/test_e2e.sh
index 7f5e9c1..d62c600 100755
--- a/test_e2e.sh
+++ b/test_e2e.sh
@@ -1675,6 +1675,19 @@ fi
 make container REGISTRY=e2e VERSION=$(make -s version)
 make test-tools REGISTRY=e2e
 
+function finish() {
+  r=$?
+  trap "" INT EXIT
+  if [[ $r != 0 ]]; then
+    echo
+    echo "the directory $DIR was not removed as it contains"\
+         "log files useful for debugging"
+  fi
+  remove_containers
+  exit $r
+}
+trap finish INT EXIT
+
 echo
 echo "test root is $DIR"
 echo