summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/application/libspid/Module2
-rw-r--r--cleopatre/application/libspid/src/config_item.c4
-rw-r--r--cleopatre/devkit/tests/libspid/utests/Makefile14
-rw-r--r--cleopatre/devkit/tests/libspid/utests/Makefile.generic12
-rw-r--r--cleopatre/devkit/tests/libspid/utests/Makefile.stub_system13
-rw-r--r--cleopatre/devkit/tests/libspid/utests/common.mk20
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/config_item_utests.c2
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c2
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/image_utests.c2
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/network_utests.c2
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/system_utests.c3
11 files changed, 57 insertions, 19 deletions
diff --git a/cleopatre/application/libspid/Module b/cleopatre/application/libspid/Module
new file mode 100644
index 0000000000..e3a80a53e0
--- /dev/null
+++ b/cleopatre/application/libspid/Module
@@ -0,0 +1,2 @@
+SOURCES := config_item.c config_line.c hpav_info.c image.c misc.c \
+ multicast_info.c network.c openssl_sha256.c secu.c system.c
diff --git a/cleopatre/application/libspid/src/config_item.c b/cleopatre/application/libspid/src/config_item.c
index 18184146c6..20da1e17b6 100644
--- a/cleopatre/application/libspid/src/config_item.c
+++ b/cleopatre/application/libspid/src/config_item.c
@@ -21,10 +21,6 @@
#include <unistd.h>
#include "libspid.h"
-#ifdef __UTESTS__
- #include "config_item_utests.h"
-#endif /* __UTESTS__ */
-
/**
* Return the values of items from a configuration file.
*
diff --git a/cleopatre/devkit/tests/libspid/utests/Makefile b/cleopatre/devkit/tests/libspid/utests/Makefile
index aa41fdb300..ba51458a8f 100644
--- a/cleopatre/devkit/tests/libspid/utests/Makefile
+++ b/cleopatre/devkit/tests/libspid/utests/Makefile
@@ -1,10 +1,4 @@
-PRJ_BASE = ../../../../application/libspid
-FILES = system network config_item config_line image hpav_info
-OBJ_FILES = $(PRJ_OBJPATH)/config_line.o $(PRJ_OBJPATH)/config_item.o
-
-LIBSPID_DIR=../../../../application/libspid
-LINUX_DIR=../../../../linux-2.6.25.10-spc300
-
-EXTRA_CFLAGS = -I$(LIBSPID_DIR)/inc -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -MMD
-
-include ../../utests_makerules
+# Default rule is all, and for any rules (all or whatever).
+all %::
+ $(MAKE) -f Makefile.generic $@
+ $(MAKE) -f Makefile.stub_system $@
diff --git a/cleopatre/devkit/tests/libspid/utests/Makefile.generic b/cleopatre/devkit/tests/libspid/utests/Makefile.generic
new file mode 100644
index 0000000000..cbfebf5a57
--- /dev/null
+++ b/cleopatre/devkit/tests/libspid/utests/Makefile.generic
@@ -0,0 +1,12 @@
+# Generic Makefile to test libspid (no stub possible for libspid with this
+# Makefile - see Makefile.stub_system for exemple).
+
+include common.mk
+
+HOST_PROGRAMS = system_utests network_utests config_item_utests \
+ config_line_utests hpav_info_utests
+
+# Generate sources & module list for each host programs.
+$(foreach prog,$(HOST_PROGRAMS),$(eval $(call utest_libspid,$(prog))))
+
+include $(BASE)/common/make/top.mk
diff --git a/cleopatre/devkit/tests/libspid/utests/Makefile.stub_system b/cleopatre/devkit/tests/libspid/utests/Makefile.stub_system
new file mode 100644
index 0000000000..2d46a0b759
--- /dev/null
+++ b/cleopatre/devkit/tests/libspid/utests/Makefile.stub_system
@@ -0,0 +1,13 @@
+# Makefile to test libspid with some stubs.
+include common.mk
+
+HOST_PROGRAMS = image_utests
+
+$(foreach prog,$(HOST_PROGRAMS),$(eval $(call utest_libspid,$(prog))))
+
+# Override sources for libspid module.
+.._cleopatre_application_libspid_MODULE_SOURCES = config_item.c \
+ config_line.c hpav_info.c image.c misc.c multicast_info.c network.c \
+ openssl_sha256.c secu.c
+
+include $(BASE)/common/make/top.mk
diff --git a/cleopatre/devkit/tests/libspid/utests/common.mk b/cleopatre/devkit/tests/libspid/utests/common.mk
new file mode 100644
index 0000000000..9c33716c3d
--- /dev/null
+++ b/cleopatre/devkit/tests/libspid/utests/common.mk
@@ -0,0 +1,20 @@
+# Common define and rules.
+
+BASE = ../../../../../cesar
+CLEO_BASE = ../cleopatre
+
+# We test libspid.
+PROJECT_DIR = $(CLEO_BASE)/application/libspid
+
+INCLUDES = $(PROJECT_DIR)/inc $(CLEO_BASE)/include
+
+DEFS = -D__UTESTS__
+
+EXTRA_HOST_LDLIBS = -lcheck -lpthread
+
+# Templates to define list of sources & module to use.
+# Parameter: $1 is executabe & source name (without .c).
+define utest_libspid
+$(1)_SOURCES = $(1).c
+$(1)_MODULES = $(PROJECT_DIR)
+endef
diff --git a/cleopatre/devkit/tests/libspid/utests/src/config_item_utests.c b/cleopatre/devkit/tests/libspid/utests/src/config_item_utests.c
index 722964a1ae..53ad201cc2 100644
--- a/cleopatre/devkit/tests/libspid/utests/src/config_item_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/config_item_utests.c
@@ -34,7 +34,7 @@
#include <net/if.h>
#include <libgen.h> /* for basename() */
-#include "config_item_utests.h"
+#include "inc/config_item_utests.h"
//#define DEBUG 1
diff --git a/cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c b/cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c
index aa8d72f19f..5558544101 100644
--- a/cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c
@@ -34,7 +34,7 @@
#include <net/if.h>
#include <libgen.h> /* for basename() */
-#include "config_item_utests.h"
+#include "inc/config_item_utests.h"
//#define DEBUG 1
diff --git a/cleopatre/devkit/tests/libspid/utests/src/image_utests.c b/cleopatre/devkit/tests/libspid/utests/src/image_utests.c
index c459030f2e..8700531933 100644
--- a/cleopatre/devkit/tests/libspid/utests/src/image_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/image_utests.c
@@ -29,7 +29,7 @@
#include <dirent.h>
#include <sys/stat.h>
-#include "image_utests.h"
+#include "inc/image_utests.h"
//#define DEBUG 1
diff --git a/cleopatre/devkit/tests/libspid/utests/src/network_utests.c b/cleopatre/devkit/tests/libspid/utests/src/network_utests.c
index 83ad6c4bda..3ed33579b8 100644
--- a/cleopatre/devkit/tests/libspid/utests/src/network_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/network_utests.c
@@ -32,7 +32,7 @@
#include <fcntl.h>
#include <net/if.h>
-#include "network_utests.h"
+#include "inc/network_utests.h"
//#define DEBUG 1
diff --git a/cleopatre/devkit/tests/libspid/utests/src/system_utests.c b/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
index ffba274382..418cf8fe60 100644
--- a/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
@@ -28,7 +28,8 @@
#include <dirent.h>
#include <sys/stat.h>
-#include "system_utests.h"
+#include "inc/system_utests.h"
+#include "path.h"
//#define DEBUG 1