wvtest/sh: Introduce cleanup function and exit on the first error

[frescor/frsh.git] / frsh_api / tests / trans_nego.sh

diff --git a/frsh_api/tests/trans_nego.sh b/frsh_api/tests/trans_nego.sh
index a37cfc0a46247daa4dafd4341c4664b05c7e117b..72af1e32f771c88ccbfd08ea152d395236a37ca8 100755 (executable)
--- a/frsh_api/tests/trans_nego.sh
+++ b/frsh_api/tests/trans_nego.sh
@@ -2,23 +2,24 @@
 
 . $(dirname $0)/wvtest.sh
 
+wvtest_cleanup() {
+    WVPASS kill `cat fcb.pid`
+    WVPASS rm fcb.pid
+    WVPASS kill `cat frm0.pid`
+    WVPASS rm frm0.pid
+    WVPASS kill `cat frm1.pid`
+    WVPASS rm frm1.pid
+    WVPASS kill `cat frm2.pid`
+    WVPASS rm frm2.pid
+}
+
+
 WVSTART Setup
 WVPASS fcb -dfcb.pid
-WVPASS frm_dummy -dfrm.pid
 WVPASS frm_dummy -dfrm0.pid -i0
 WVPASS frm_dummy -dfrm1.pid -i1
-
-trap '
-WVSTART Kill
-WVPASS kill `cat fcb.pid`
-WVPASS rm fcb.pid
-WVPASS kill `cat frm.pid`
-WVPASS rm frm.pid
-WVPASS kill `cat frm0.pid`
-WVPASS rm frm0.pid
-WVPASS kill `cat frm1.pid`
-WVPASS rm frm1.pid
-' 0
+WVPASS frm_dummy -dfrm2.pid -i2
 
 WVPASS trans_nego
 WVPASS trans_nego2
+