frsh: Do not include test functions

The output of test is easier to read when the name of the test script is
displayed in the test output. Therefore, we copy the setup/exit code
that is common to the all tests to the tests themselves.

diff --git a/frsh_api/tests/dummy_spare_capacity.sh b/frsh_api/tests/dummy_spare_capacity.sh
index 0da7df48be07e1209db0421a54ef40c7bb72e576..8bc45a04552a853022750f3181fd3d5d66c869a5 100755 (executable)
--- a/frsh_api/tests/dummy_spare_capacity.sh
+++ b/frsh_api/tests/dummy_spare_capacity.sh
@@ -2,5 +2,14 @@
 
 . $(dirname $0)/wvtest.sh
 
-setup_dummy
+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 2fbd0c7f25334fdbcad30afa67f3209bf36e706c..a788859a7a76a89d557920be02ed91dfb725eede 100755 (executable)
--- a/frsh_api/tests/negotiation.sh
+++ b/frsh_api/tests/negotiation.sh
@@ -2,5 +2,17 @@
 
 . $(dirname $0)/wvtest.sh
 
-setup_dummy
+trap '' SIGINT
+
+WVSTART Setup
+WVPASS fcb -dfcb.pid
+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 b20d0bb7ade9f83f70529b0fea5f1ddd52c50efc..fc5d50b7b5660eebdb613143e30a8a6c80f6d735 100755 (executable)
--- a/frsh_api/tests/trans_nego.sh
+++ b/frsh_api/tests/trans_nego.sh
@@ -8,7 +8,9 @@ WVPASS frm_dummy -dfrm0.pid -i0
 WVPASS frm_dummy -dfrm1.pid -i1
 WVPASS frm_dummy -dfrm2.pid -i2
 
-trap '
+WVPASS trans_nego
+WVPASS trans_nego2
+
 WVSTART Kill
 WVPASS kill `cat fcb.pid`
 WVPASS rm fcb.pid
@@ -18,7 +20,3 @@ WVPASS kill `cat frm1.pid`
 WVPASS rm frm1.pid
 WVPASS kill `cat frm2.pid`
 WVPASS rm frm2.pid
-' 0
-
-WVPASS trans_nego
-WVPASS trans_nego2

diff --git a/frsh_api/tests/wvtest.sh b/frsh_api/tests/wvtest.sh
deleted file mode 100644 (file)
index e04d48cce0f065d0ebce70a3a696bead03e0c699..0000000000000000000000000000000000000000
--- a/frsh_api/tests/wvtest.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-. $(dirname $0)/../../../wvtest.sh
-
-setup_dummy() {
-    WVSTART Setup
-    WVPASS fcb -dfcb.pid
-    WVPASS frm_dummy -dfrm.pid
-    trap '
-WVSTART Kill
-WVPASS kill `cat fcb.pid`
-WVPASS rm fcb.pid
-WVPASS kill `cat frm.pid`
-WVPASS rm frm.pid
-' 0
-}

diff --git a/frsh_api/tests/wvtest.sh b/frsh_api/tests/wvtest.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..19820690ee7064479b6524e1b3bfb80a9a936270
--- /dev/null
+++ b/frsh_api/tests/wvtest.sh
@@ -0,0 +1 @@
+../../../wvtest.sh
\ No newline at end of file