Introduce t-ok

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

diff --git a/adt/acommon b/adt/acommon
index b7519dec9d55f5ff531f92f07c3562f470a5cb65..1baf9e169469102a872459b2da1407c203b8d18f 100644 (file)
--- a/adt/acommon
+++ b/adt/acommon
@@ -194,3 +194,8 @@ setup-pair () {
     setup-host client
     setup-host server
 }
+
+t-ok () {
+    trap '' 0
+    echo ok.
+}

diff --git a/adt/adt-full b/adt/adt-full
index e764fe8c99d313a0d2ae9c7a3f1fadd148df3843..39d367ecd3db9d8fede5c9eb854453bc2a3992f4 100755 (executable)
--- a/adt/adt-full
+++ b/adt/adt-full
@@ -33,5 +33,4 @@ echo tests passed, cleaning up.
 
 $src/adt/acleanup
 
-trap '' 0
-echo ok.
+t-ok

diff --git a/adt/adt-initscript b/adt/adt-initscript
index e4e6b38c98622f87c6183692037a511ebc97bd15..23daa88fcf8a2163aa18a52aae94d240beeac73b 100755 (executable)
--- a/adt/adt-initscript
+++ b/adt/adt-initscript
@@ -32,4 +32,4 @@ service hippotatd stop
 ( LC_MESSAGES=C nc -v localhost 8099 2>&1 ||: ) \
     | tee /dev/stderr | grep 'Connection refused'
 
-echo ok.
+t-ok