From 1f16c2680dd0da47de0fcbbb35cc2de24d0e0e94 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 24 Feb 2011 17:28:31 +0100
Subject: [PATCH] wvtest/sh: Introduce cleanup function and exit on the first
 error

---
 frsh_api/tests/dummy_spare_capacity.sh | 12 +++++++-----
 frsh_api/tests/negotiation.sh          | 12 ++++++------
 frsh_api/tests/trans_nego.sh           | 21 ++++++++++++---------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/frsh_api/tests/dummy_spare_capacity.sh b/frsh_api/tests/dummy_spare_capacity.sh
index 8bc45a0..615b7ac 100755
--- a/frsh_api/tests/dummy_spare_capacity.sh
+++ b/frsh_api/tests/dummy_spare_capacity.sh
@@ -2,14 +2,16 @@
 
 . $(dirname $0)/wvtest.sh
 
+wvtest_cleanup() {
+    WVPASS kill `cat fcb.pid`
+    WVPASS rm fcb.pid
+    WVPASS kill `cat frm.pid`
+    WVPASS rm frm.pid
+}
+
 WVSTART Setup
 WVPASS fcb -dfcb.pid
 WVPASS frm_dummy -dfrm.pid
 
 WVPASS dummy_spare_capacity
 
-WVSTART Kill
-WVPASS kill `cat fcb.pid`
-WVPASS rm fcb.pid
-WVPASS kill `cat frm.pid`
-WVPASS rm frm.pid
diff --git a/frsh_api/tests/negotiation.sh b/frsh_api/tests/negotiation.sh
index a788859..1962317 100755
--- a/frsh_api/tests/negotiation.sh
+++ b/frsh_api/tests/negotiation.sh
@@ -2,7 +2,12 @@
 
 . $(dirname $0)/wvtest.sh
 
-trap '' SIGINT
+wvtest_cleanup() {
+    WVPASS kill `cat fcb.pid`
+    WVPASS rm fcb.pid
+    WVPASS kill `cat frm.pid`
+    WVPASS rm frm.pid
+}
 
 WVSTART Setup
 WVPASS fcb -dfcb.pid
@@ -11,8 +16,3 @@ WVPASS frm_dummy -dfrm.pid
 
 WVPASS negotiation
 
-WVSTART Kill
-WVPASS kill `cat fcb.pid`
-WVPASS rm fcb.pid
-WVPASS kill `cat frm.pid`
-WVPASS rm frm.pid
diff --git a/frsh_api/tests/trans_nego.sh b/frsh_api/tests/trans_nego.sh
index fc5d50b..72af1e3 100755
--- a/frsh_api/tests/trans_nego.sh
+++ b/frsh_api/tests/trans_nego.sh
@@ -2,6 +2,18 @@
 
 . $(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 -dfrm0.pid -i0
@@ -11,12 +23,3 @@ WVPASS frm_dummy -dfrm2.pid -i2
 WVPASS trans_nego
 WVPASS trans_nego2
 
-WVSTART Kill
-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
-- 
2.39.2