From e7c14137fa4f6c37b9418bc161f09d2617657274 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 21 Oct 2006 11:50:52 +0000
Subject: r19444: merge from samba4:

reset trap when we have removed the test specifc files already

metze
(This used to be commit 36065025c70d4ae3115554aac44c8807725a63b7)
---
 source3/script/tests/test_functions.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 3917eb86ac..1cc9ea1264 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -226,6 +226,7 @@ testit() {
    		else
 			echo "TEST FAILED: $cmdline (status $status)"
 		fi
+		trap "" EXIT
 		return 1;
 	fi
 	rm -f $TEST_LOG;
@@ -240,6 +241,7 @@ testit() {
 		echo "TEST PASSED: $name"
 		echo "=========================================="
 	fi
+	trap "" EXIT
 	return 0;
 }
 
-- 
cgit