Move tests back to submodules

Now, when wvtest is integrated with OMK, it is not necessary to have
all tests in a single central directory.

diff --git a/build/aquosa/tests/Makefile b/build/aquosa/tests/Makefile
deleted file mode 100644 (file)
index b22a357..0000000
--- a/build/aquosa/tests/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generic directory or leaf node makefile for OCERA make framework
-
-ifndef MAKERULES_DIR
-MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
-endif
-
-ifeq ($(MAKERULES_DIR),)
-all : default
-.DEFAULT::
-       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
-else
-include $(MAKERULES_DIR)/Makefile.rules
-endif
-

diff --git a/build/aquosa/tests/Makefile.omk b/build/aquosa/tests/Makefile.omk
deleted file mode 100644 (file)
index b2c5d38..0000000
--- a/build/aquosa/tests/Makefile.omk
+++ /dev/null
@@ -1,8 +0,0 @@
-wvtest_SCRIPTS = t0001-negotiation.sh
-
-test_PROGRAMS += negotiation.wv
-negotiation.wv_SOURCES = negotiation.cc
-
-CFLAGS += -DWVTEST_CONFIGURED
-lib_LOADLIBES = wvtest frsh
-

diff --git a/build/aquosa/tests/Makefile.test b/build/aquosa/tests/Makefile.test
deleted file mode 100644 (file)
index fb20c3e..0000000
--- a/build/aquosa/tests/Makefile.test
+++ /dev/null
@@ -1,12 +0,0 @@
-
-T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
-
-all:
-       ./wvtestrun $(MAKE) -f Makefile.test test
-
-test: $(T)
-
-.PHONY: $(T)
-$(T):
-       bash $@
-

diff --git a/build/aquosa/tests/negotiation.cc b/build/aquosa/tests/negotiation.cc
deleted file mode 100644 (file)
index d4ce749..0000000
--- a/build/aquosa/tests/negotiation.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <frsh.h>
-#include <error.h>
-#include <res_dummy.h>
-#include <getopt.h>
-#include <ul_logreg.h>
-#include <wvtest.h>
-
-#define N 3
-
-int b[N] = { 10, 20, 30 };
-
-// TODO: Allow specifying loglevel in evironment
-
-// static struct option long_opts[] = {
-//     { "loglevel", 1, 0, 'l' },
-//     { 0, 0, 0, 0}
-// };
-
-// static void
-// usage(void)
-// {
-//     printf("usage: negotiation [ options ]\n");
-//     printf("  -l, --loglevel <number>|<domain>=<number>,...\n");
-// }
-
-int ret;
-frsh_contract_t contract[N];
-frsh_vres_id_t vres[N];
-frsh_rel_time_t budget, period, deadline;
-int i;
-
-WVTEST_MAIN("basic negotiation")
-{
-//     char opt;
-
-//     while ((opt = getopt_long(argc, argv, "l:", &long_opts[0], NULL)) != EOF) {
-//             switch (opt) {
-//                     case 'l':
-       ul_log_domain_arg2levels("forb_proto_inet=6");
-//                             break;
-//                     case 'h':
-//                     /\*default:*\/
-//                             usage();
-//                             exit(opt == 'h' ? 0 : 1);
-//             }
-//     }
-
-       ret = WVFRSH(frsh_init());
-       if (ret) exit(1);
-
-       /* Negotiate N contracts */
-       for (i=0; i<N; i++) {
-               ret = WVFRSH(frsh_contract_init(&contract[i]));
-               if (ret) exit(1);
-
-               ret = WVFRSH(frsh_contract_set_resource_and_label(
-                       &contract[i],
-                       DUMMY_RESOURCE_TYPE, DUMMY_RESOURCE_ID,
-                       NULL));
-               if (ret) exit(1);
-
-               budget = fosa_msec_to_rel_time(b[i]);
-               period = fosa_msec_to_rel_time(100);
-               deadline = fosa_msec_to_rel_time(50);
-               ret = WVFRSH(frsh_contract_set_basic_params(&contract[i],
-                                                           &budget,
-                                                           &period,
-                                                           FRSH_WT_BOUNDED,
-                                                           FRSH_CT_REGULAR));
-               if (ret) exit(1);
-               
-               ret = WVFRSH(frsh_contract_set_timing_reqs(&contract[i],
-                                                          false, &deadline));
-               if (ret) exit(1);
-               
-               ret = WVFRSH(frsh_contract_negotiate(&contract[i], &vres[i]));
-               if (ret) exit(1);
-       }
-}
-
-WVTEST_MAIN("renegotiation")
-{
-       for (i=0; i<2 /*N*/; i++) {
-               // FIXME: There is a bug on the test - the 3rd renegotiation fails
-               budget = fosa_msec_to_rel_time(2*b[i]);
-               period = fosa_msec_to_rel_time(110);
-               ret = WVFRSH(frsh_contract_set_basic_params(&contract[i],
-                                                           &budget,
-                                                           &period,
-                                                           FRSH_WT_BOUNDED,
-                                                           FRSH_CT_REGULAR));
-               if (ret) exit(1);
-
-               ret = WVFRSH(frsh_contract_renegotiate_sync(&contract[i], vres[i]));
-               if (ret) exit(1);
-       }
-}
-
-WVTEST_MAIN("cancelation")
-{
-       /* Cancel N contracts */
-       for (i=0; i<N; i++) {
-               ret = WVFRSH(frsh_contract_cancel(vres[i]));
-               if (ret) exit(1);
-       }
-
-       frsh_destroy();
-}

diff --git a/build/aquosa/tests/t0001-negotiation.sh b/build/aquosa/tests/t0001-negotiation.sh
deleted file mode 100755 (executable)
index f92a309..0000000
--- a/build/aquosa/tests/t0001-negotiation.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/wvtest.sh
-
-WVSTART Setup
-WVPASS fcb -dfcb.pid
-WVPASS frm_dummy -dfrm.pid
-WVPASS negotiation.wv
-WVSTART Kill
-WVPASS kill `cat fcb.pid`
-WVPASS rm fcb.pid
-WVPASS kill `cat frm.pid`
-WVPASS rm frm.pid
-

diff --git a/build/aquosa/tests/wvtestrun b/build/aquosa/tests/wvtestrun
deleted file mode 120000 (symlink)
index 50e8b95..0000000
--- a/build/aquosa/tests/wvtestrun
+++ /dev/null
@@ -1 +0,0 @@
-../../../src/wvtest/wvtestrun
\ No newline at end of file

diff --git a/build/aquosa/wvtestrun b/build/aquosa/wvtestrun
new file mode 120000 (symlink)
index 0000000..eebe3b7
--- /dev/null
+++ b/build/aquosa/wvtestrun
@@ -0,0 +1 @@
+../../src/wvtest/wvtestrun
\ No newline at end of file

diff --git a/src/frsh b/src/frsh
index 41e37f2220475bafb4bf274f5800dd1734581a10..901352f50f6cd44a2275f0affccad01eb510cd6b 160000 (submodule)
--- a/src/frsh
+++ b/src/frsh
@@ -1 +1 @@
-Subproject commit 41e37f2220475bafb4bf274f5800dd1734581a10
+Subproject commit 901352f50f6cd44a2275f0affccad01eb510cd6b

diff --git a/build/aquosa/tests/wvtest.sh b/src/wvtest.sh
similarity index 100%
rename from build/aquosa/tests/wvtest.sh
rename to src/wvtest.sh