tests adapted to new names.. now the compile.. in makefile i add a target 'tests...

git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1120 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/tests/tests_frescan/Makefile b/tests/tests_frescan/Makefile
index 1cd4f96e68e3b0ae2e328ee915ea27a0c9b2e885..eaca9996c9e0ffe2cbe88417b3d5e76916cd9680 100755 (executable)
--- a/tests/tests_frescan/Makefile
+++ b/tests/tests_frescan/Makefile
@@ -3,3 +3,8 @@ include ../../rules.mk
 
 CFLAGS += -I$(FNA_PATH)/src_frescan/
 LDFLAGS += $(FNA_PATH)/lib/libfrescan.o -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) -lm
+
+EXES := $(patsubst %.c,%.exe,$(wildcard *.c))
+
+.PHONY: tests
+tests: $(EXES)
\ No newline at end of file

diff --git a/tests/tests_frescan/test_frescan_bwres_init.c b/tests/tests_frescan/test_frescan_bwres_init.c
index c3c455ac3a6b7a7bb42ecb580582f571c62f72cf..1de4734503c791e7ecba5ffaf15b2b6459c0368d 100644 (file)
--- a/tests/tests_frescan/test_frescan_bwres_init.c
+++ b/tests/tests_frescan/test_frescan_bwres_init.c
@@ -3,7 +3,7 @@
 #include <unistd.h>   // sleep
 
 #include "frescan.h"
-#include "frescan_bandwidth_reservation.h"
+#include "frescan_bwres.h"
 
 #define ERROR(s) {perror (s); exit (-1);}
 

diff --git a/tests/tests_frescan/test_frescan_bwres_negotiate_in_master.c b/tests/tests_frescan/test_frescan_bwres_negotiate_in_master.c
index ae88432b626f2c90af71731c15ed3512b6d0559a..224d78d0c38772508d3d24bb48a351a4e12cd1df 100644 (file)
--- a/tests/tests_frescan/test_frescan_bwres_negotiate_in_master.c
+++ b/tests/tests_frescan/test_frescan_bwres_negotiate_in_master.c
@@ -3,7 +3,7 @@
 #include <unistd.h>   // sleep
 
 #include "frescan.h"
-#include "frescan_bandwidth_reservation.h"
+#include "frescan_bwres.h"
 
 #define ERROR(s) {perror (s); exit (-1);}
 

diff --git a/tests/tests_frescan/test_frescan_bwres_negotiate_in_slave.c b/tests/tests_frescan/test_frescan_bwres_negotiate_in_slave.c
index 4d4dcb89a7f067e412c54a96a53e5c95a43af8a2..b81d4b7ab26324682596cdf9e82863725377bd8b 100644 (file)
--- a/tests/tests_frescan/test_frescan_bwres_negotiate_in_slave.c
+++ b/tests/tests_frescan/test_frescan_bwres_negotiate_in_slave.c
@@ -3,7 +3,7 @@
 #include <unistd.h>   // sleep
 
 #include "frescan.h"
-#include "frescan_bandwidth_reservation.h"
+#include "frescan_bwres.h"
 #include "frescan_servers.h"
 
 #define ERROR(s) {perror (s); exit (-1);}

diff --git a/tests/tests_frescan/test_frescan_replyobj_timedwait.c b/tests/tests_frescan/test_frescan_bwres_robjs_timedwait.c
similarity index 86%
rename from tests/tests_frescan/test_frescan_replyobj_timedwait.c
rename to tests/tests_frescan/test_frescan_bwres_robjs_timedwait.c
index 4c97d8dce4403bde7d11cf83ae2d316fa373ff61..b0b0cec5348f46e92f4654ccc7a97a120bdbb644 100644 (file)
--- a/tests/tests_frescan/test_frescan_replyobj_timedwait.c
+++ b/tests/tests_frescan/test_frescan_bwres_robjs_timedwait.c
@@ -1,5 +1,5 @@
 /*!
- * @file test_frescan_replyobj_timedwait.c
+ * @file test_frescan_bwres_robjs_timedwait.c
  *
  * @brief test for the basic behaviour of timedwait
  *
@@ -29,7 +29,7 @@
 #include <unistd.h> /* for sleep */
 #include "fosa_threads_and_signals.h" /* for fosa_thread_xxx */
 #include "fosa_clocks_and_timers.h" /* for fosa_clock_get_time */
-#include "frescan_reply_objects.h"
+#include "frescan_bwres_robjs.h"
 
 #define CEILING 10
 
@@ -48,10 +48,10 @@ int main()
         err = fosa_thread_set_prio(fosa_thread_self(), CEILING - 2);
         assert(err == 0);
 
-        err = frescan_replyobjects_init(CEILING);
+        err = frescan_bwres_robjs_init(CEILING);
         assert(err == 0);
 
-        err = frescan_replyobject_alloc(&id, CEILING);
+        err = frescan_bwres_robjs_alloc(&id, CEILING);
         assert(err == 0);
 
         err = fosa_thread_attr_init(&th_attr);
@@ -72,7 +72,7 @@ int main()
         printf("wait: %d sec %d nsec\n", now.tv_sec, now.tv_nsec);
 
         now.tv_sec = now.tv_sec + 2;
-        err = frescan_replyobject_timedwait(id, &now);
+        err = frescan_bwres_robjs_timedwait(id, &now);
         assert (err == 0);
 
         err = fosa_clock_get_time(FOSA_CLOCK_ABSOLUTE, &now);
@@ -81,12 +81,12 @@ int main()
         printf("wait again: %d sec %d nsec\n", now.tv_sec, now.tv_nsec);
 
         now.tv_sec = now.tv_sec + 2;
-        err = frescan_replyobject_timedwait(id, &now);
+        err = frescan_bwres_robjs_timedwait(id, &now);
         assert (err == FRESCAN_ETIMEDOUT);
 
         printf("timeout!: %d sec %d nsec\n", now.tv_sec, now.tv_nsec);
 
-        err = frescan_replyobject_free(id);
+        err = frescan_bwres_robjs_free(id);
         assert(err == 0);
 
         printf("TEST [OK!]\n");
@@ -100,7 +100,7 @@ static void *thread_code(void *arg)
         frescan_robj_id_t reply = (frescan_robj_id_t)arg;
 
         printf("Thread signaling\n");
-        err = frescan_replyobject_signal(reply);
+        err = frescan_bwres_robjs_signal(reply);
         assert(err == 0);
 
         printf("Thread terminating\n");

diff --git a/tests/tests_frescan/test_frescan_replyobj_wait_signal.c b/tests/tests_frescan/test_frescan_bwres_robjs_wait.c
similarity index 81%
rename from tests/tests_frescan/test_frescan_replyobj_wait_signal.c
rename to tests/tests_frescan/test_frescan_bwres_robjs_wait.c
index 080353fb85424a79e80bf66f8d2d1a1026ba49cd..80cd7c45f9ce736234c55f283f70bb8a815fd491 100644 (file)
--- a/tests/tests_frescan/test_frescan_replyobj_wait_signal.c
+++ b/tests/tests_frescan/test_frescan_bwres_robjs_wait.c
@@ -1,5 +1,5 @@
 /*!
- * @file test_frescan_replyobj_wait_signal.c
+ * @file test_frescan_bwres_robjs_wait.c
  *
  * @brief test for the basic behaviour of reply objects
  *
@@ -12,7 +12,7 @@
  *
  * @comments
  *
- * This file contains a basic test for the frescan_reply_objects module.
+ * This file contains a basic test for the frescan_bwres_robjs module.
  * The main thread allocates a reply object, creates a thread and waits
  * on the reply object until the thread signals it.
  *
@@ -26,7 +26,7 @@
 #include <assert.h> /* for assert */
 #include <unistd.h> /* for sleep */
 #include "fosa_threads_and_signals.h" /* for fosa_thread_xxx */
-#include "frescan_reply_objects.h"
+#include "frescan_bwres_robjs.h"
 
 #define CEILING 10
 
@@ -44,10 +44,10 @@ int main()
         err = fosa_thread_set_prio(fosa_thread_self(), CEILING - 1);
         assert(err == 0);
 
-        err = frescan_replyobjects_init(CEILING);
+        err = frescan_bwres_robjs_init(CEILING);
         assert(err == 0);
 
-        err = frescan_replyobject_alloc(&id, CEILING);
+        err = frescan_bwres_robjs_alloc(&id, CEILING);
         assert(err == 0);
 
         err = fosa_thread_attr_init(&th_attr);
@@ -62,11 +62,11 @@ int main()
         err = fosa_thread_attr_destroy(&th_attr);
         assert(err == 0);
 
-        err = frescan_replyobject_wait(id);
+        err = frescan_bwres_robjs_wait(id);
         assert(err == 0);
         printf("signal received\n");
 
-        err = frescan_replyobject_free(id);
+        err = frescan_bwres_robjs_free(id);
         assert(err == 0);
 
         printf("TEST [OK!]\n");
@@ -83,7 +83,7 @@ static void *thread_code(void *arg)
         sleep(2);
 
         printf("Thread signaling\n");
-        err = frescan_replyobject_signal(reply);
+        err = frescan_bwres_robjs_signal(reply);
         assert(err == 0);
 
         printf("Thread terminating\n");

diff --git a/tests/tests_frescan/test_frescan_servers_send_basic.c b/tests/tests_frescan/test_frescan_servers_send_basic.c
index c069a0d0d951944542b115e34a101de099a3d20a..e5631b408291d2f890e77fe3d0ba14a887b7c81e 100644 (file)
--- a/tests/tests_frescan/test_frescan_servers_send_basic.c
+++ b/tests/tests_frescan/test_frescan_servers_send_basic.c
@@ -12,7 +12,7 @@
 
 #define NETWORK 0
 
-// #define SENDER
+#define SENDER
 // #define ENABLE_LOGGING
 
 #ifdef SENDER