Only do the trap in test-prep

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/adt/acommon b/adt/acommon
index b0fdc9b1fd530011eb493433fa9c9b6043c7e855..25e22350bd15a5ab3044eda89c4ad54ddac1483e 100644 (file)
--- a/adt/acommon
+++ b/adt/acommon
@@ -10,7 +10,8 @@ set -x
 
 on_failure=:
 
-trap '
+test-prep () {
+    trap '
         rc=$?
  : =================== ^^ TEST FAILURE ^^ ====================
        set +e
@@ -19,7 +20,6 @@ trap '
         exit $rc
 ' 0
 
-test-prep () {
     determine-tname adt
 
     if [ "$AUTOPKGTEST_TMP" ]; then