From 77c020a0437480d6ca65d095afdd0838a1100360 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 11 Jan 2023 00:50:14 +0000
Subject: [PATCH] Only do the trap in test-prep

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 adt/acommon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adt/acommon b/adt/acommon
index b0fdc9b..25e2235 100644
--- 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
-- 
2.30.2