From 7de8de62c7651ea6c50b76b883c07dc67b8c7772 Mon Sep 17 00:00:00 2001 From: Cyril Jourdan Date: Thu, 3 Nov 2011 15:40:31 +0100 Subject: cleo/devkit/tests: use cesar build system for managerd utests, refs #2772 This commits also suppress the useles managerd ftest (that consisted in compiling the app...) --- cleopatre/application/managerd/Module | 1 + cleopatre/application/managerd/src/vs_mme.c | 1 + cleopatre/devkit/tests/managerd/ftests/Makefile | 47 --------------- cleopatre/devkit/tests/managerd/utests/Makefile | 69 ++++++---------------- .../devkit/tests/managerd/utests/override/Module | 1 + .../managerd/utests/override/inc/libmme_stub.h | 34 ----------- .../managerd/utests/override/inc/libspid_stub.h | 57 ------------------ .../managerd/utests/override/src/libmme_stub.c | 16 ----- .../managerd/utests/override/src/libspid_stub.c | 14 ++++- 9 files changed, 32 insertions(+), 208 deletions(-) create mode 100644 cleopatre/application/managerd/Module delete mode 100644 cleopatre/devkit/tests/managerd/ftests/Makefile create mode 100644 cleopatre/devkit/tests/managerd/utests/override/Module delete mode 100644 cleopatre/devkit/tests/managerd/utests/override/inc/libmme_stub.h delete mode 100644 cleopatre/devkit/tests/managerd/utests/override/inc/libspid_stub.h delete mode 100644 cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c diff --git a/cleopatre/application/managerd/Module b/cleopatre/application/managerd/Module new file mode 100644 index 0000000000..5e47b8b0d9 --- /dev/null +++ b/cleopatre/application/managerd/Module @@ -0,0 +1 @@ +SOURCES := bridge.c gpio_event.c managerd.c mme_nl.c vs_mme.c diff --git a/cleopatre/application/managerd/src/vs_mme.c b/cleopatre/application/managerd/src/vs_mme.c index 45070d8be1..dbbe35cc93 100644 --- a/cleopatre/application/managerd/src/vs_mme.c +++ b/cleopatre/application/managerd/src/vs_mme.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "bridge.h" #include "vs_mme.h" diff --git a/cleopatre/devkit/tests/managerd/ftests/Makefile b/cleopatre/devkit/tests/managerd/ftests/Makefile deleted file mode 100644 index 3f5fe6caed..0000000000 --- a/cleopatre/devkit/tests/managerd/ftests/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -BIN=managerd -OBJPATH=obj -SRCPATH=../../../../application/managerd/src -INCPATH=../../../../application/managerd/inc - -ifeq ($(CC_FOR_TARGET),) #direct compile -CC=arm-linux-gcc -CC_WITH_CFLAGS=$(CC) -D__FTEST_PC__ -I/opt/spidcom/spc300/usr/include -g -Os -CC_WITHOUT_CFLAGS=$(CC) -LINUX_DIR=../../../../linux-2.6.25.10-spc300 -LIBSPID_DIR=../../../../application/libspid -LIBMME_DIR=../../../../application/libmme -else #compile from buildroot -CC_WITH_CFLAGS=$(CC) -CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET) -endif -EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -MMD -LIBS=-L$(LIBMME_DIR) -L$(LIBSPID_DIR) -lmme -lspid - -SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c)) -OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o)) -DEPS=$(patsubst %o,%d,$(OBJS)) - -all: $(BIN) - -$(BIN): $(OBJPATH) libspid libmme $(OBJS) - $(CC_WITHOUT_CFLAGS) -static -o $@ $(OBJS) $(LIBS) - -$(OBJPATH)/%.o: $(SRCPATH)/%.c - $(CC_WITH_CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $< - -$(OBJPATH): - mkdir -p $(OBJPATH) - -libspid: - make -C $(LIBSPID_DIR) libspid.a - -libmme: - make -C $(LIBMME_DIR) libmme.a - - --include $(DEPS) - -.PHONY: all clean - -clean: - rm -f $(OBJS) $(DEPS) $(BIN) diff --git a/cleopatre/devkit/tests/managerd/utests/Makefile b/cleopatre/devkit/tests/managerd/utests/Makefile index 3cd0944441..28a8df1ec3 100644 --- a/cleopatre/devkit/tests/managerd/utests/Makefile +++ b/cleopatre/devkit/tests/managerd/utests/Makefile @@ -1,63 +1,28 @@ -TEST_NAME = utests +BASE = ../../../../../cesar +CLEO_BASE = ../cleopatre -OBJPATH = ./obj -PRJ_OBJPATH = $(OBJPATH)/prj -TEST_OBJPATH = $(OBJPATH)/test -LIB_STUB_OBJPATH = $(OBJPATH)/lib_stub +LINUX_PATH = $(CLEO_BASE)/linux-2.6.25.10-spc300 -BASE = ../../../.. -PRJ_BASE = $(BASE)/application/managerd -FILES = vs_mme +# We test managerd. +PROJECT_DIR = $(CLEO_BASE)/application/managerd -LIB_STUB_DIR=$(BASE)/devkit/tests/managerd/utests/override -LIB_STUB_SRCPATH = $(LIB_STUB_DIR)/src +LIBMME_BASE = $(CLEO_BASE)/application/libmme +LIBSPID_BASE = $(CLEO_BASE)/application/libspid +OVERRIDE_BASE = $(CLEO_BASE)/devkit/tests/managerd/utests/override -LINUX_DIR=../../../../linux-2.6.25.10-spc300 +INCLUDES = $(PROJECT_DIR)/inc $(LINUX_PATH)/include/asm-arm/arch-spc300 \ + $(LIBMME_BASE)/inc $(LIBSPID_BASE)/inc $(LINUX_PATH)/include -PRJ_SRCPATH = $(PRJ_BASE)/src -TEST_SRCPATH = ./src -PRJ_INCPATH = $(PRJ_BASE)/inc -TEST_INCPATH = ./inc +EXTRA_HOST_LDLIBS = -lcheck -lpthread -LIBMME_BASE = $(BASE)/application/libmme -LIBSPID_BASE = $(BASE)/application/libspid +DEFS = -D__UTESTS__ -EXTRA_CFLAGS = -I$(LIB_STUB_DIR)/inc -I$(LIBMME_BASE)/inc -I$(LIBSPID_BASE)/inc -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -MMD +HOST_PROGRAMS = vs_mme_utests -BINS = $(foreach file, $(FILES), $(OBJPATH)/$(file).elf) +vs_mme_utests_SOURCES = vs_mme_utests.c +vs_mme_utests_MODULES = $(PROJECT_DIR) $(OVERRIDE_BASE) -CC=gcc -CFLAGS = -Wall -g -D__UTESTS__ -I$(PRJ_INCPATH) -I$(TEST_INCPATH) $(EXTRA_CFLAGS) -LDFLAGS = -LIBS = -lcheck - -all: preall $(BINS) - -clean: - rm -rf $(TEST_OBJPATH) - rm -rf $(PRJ_OBJPATH) - rm -rf $(LIB_STUB_OBJPATH) - rm -rf $(OBJPATH) - -preall: - mkdir -p $(OBJPATH) - mkdir -p $(PRJ_OBJPATH) - mkdir -p $(TEST_OBJPATH) - mkdir -p $(LIB_STUB_OBJPATH) - -.PHONY: all clean -.PRECIOUS: $(PRJ_OBJPATH)/%.o $(TEST_OBJPATH)/%.o $(LIB_STUB_OBJPATH)/%.o - -$(OBJPATH)/%.elf: $(PRJ_OBJPATH)/%.o $(TEST_OBJPATH)/%_$(TEST_NAME).o $(LIB_STUB_OBJPATH)/libmme_stub.o $(LIB_STUB_OBJPATH)/libspid_stub.o - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - -$(TEST_OBJPATH)/%.o: $(TEST_SRCPATH)/%.c - $(CC) $(CFLAGS) -c -o $@ $< - -$(PRJ_OBJPATH)/%.o: $(PRJ_SRCPATH)/%.c - $(CC) $(CFLAGS) -c -o $@ $< - -$(LIB_STUB_OBJPATH)/%.o: $(LIB_STUB_SRCPATH)/%.c - $(CC) $(CFLAGS) -c -o $@ $< +.._cleopatre_application_managerd_MODULE_SOURCES = bridge.c mme_nl.c vs_mme.c +include $(BASE)/common/make/top.mk diff --git a/cleopatre/devkit/tests/managerd/utests/override/Module b/cleopatre/devkit/tests/managerd/utests/override/Module new file mode 100644 index 0000000000..6b091f0c8c --- /dev/null +++ b/cleopatre/devkit/tests/managerd/utests/override/Module @@ -0,0 +1 @@ +SOURCES := libspid_stub.c diff --git a/cleopatre/devkit/tests/managerd/utests/override/inc/libmme_stub.h b/cleopatre/devkit/tests/managerd/utests/override/inc/libmme_stub.h deleted file mode 100644 index 7abf681778..0000000000 --- a/cleopatre/devkit/tests/managerd/utests/override/inc/libmme_stub.h +++ /dev/null @@ -1,34 +0,0 @@ -/* SPC300-eoc bundle {{{ - * - * Copyright (C) 2009 Spidcom - * - * <<>> - * - * }}} */ -/** - * \file devkit/tests/managerd/utests/override/inc/libmme_stub.h - * \brief Type definitions and declarations of libmme functions used in managerd daemon - * \ingroup managerd - * - * Type definitions, and function declarations - */ -#ifndef LIBMME_STUB_H -#define LIBMME_STUB_H - -#define MME_TYPE 0x88e1 /* MME Ethertype (SPiDCOM MME Protocol) */ -#define MME_VERSION 0x01 -#define MME_MIN_SIZE 60 /* minimum size of MME packet is 60 octets (like for eth packet witout CRC) */ -#define MME_TYPE_CNF 0x0001 - -typedef struct -{ - unsigned char mme_dest[6]; /* Destination node */ - unsigned char mme_src[6]; /* Source node */ - unsigned short mtype; /* 0x88e1 (iee assigned Ethertype) */ - unsigned char mmv; /* Management Message Version */ - unsigned short mmtype; /* Management Message Type */ - unsigned short fmi; /* Fragmentation Management Info */ -} __attribute__ ((__packed__)) MME_t; - - -#endif /* LIBMME_STUB_H */ diff --git a/cleopatre/devkit/tests/managerd/utests/override/inc/libspid_stub.h b/cleopatre/devkit/tests/managerd/utests/override/inc/libspid_stub.h deleted file mode 100644 index 24d266ad57..0000000000 --- a/cleopatre/devkit/tests/managerd/utests/override/inc/libspid_stub.h +++ /dev/null @@ -1,57 +0,0 @@ -/* SPC300-eoc bundle {{{ - * - * Copyright (C) 2009 Spidcom - * - * <<>> - * - * }}} */ -/** - * \file devkit/tests/managerd/utests/override/inc/libspid_stub.h - * \brief Type definition and declarations of libspid functions used in managerd daemon - * \ingroup managerd - * - * Type definition, and function declarations - */ -#ifndef LIBSPID_STUB_H -#define LIBSPID_STUB_H - -#include "spid_img_desc.h" -#include "nvram.h" - -typedef enum { - LIBSPID_SUCCESS = 0, - /** bad input parameters */ - LIBSPID_ERROR_PARAM, - /** not enough available space */ - LIBSPID_ERROR_NO_SPACE, - /** item / data not found */ - LIBSPID_ERROR_NOT_FOUND, - /** system error, see errno for more details */ - LIBSPID_ERROR_SYSTEM, -} libspid_error_t; - -/** structure for EoC device information */ -typedef struct { - /** slave model number */ - char model_no[64]; - /** number of ethernet ports on the slave */ - unsigned int port_amount; - /** slave software version */ - char sw_version[64]; - /** downstream attenuation */ - char downstream_attenuation; -} libspid_eoc_dev_info_t; - -typedef enum { - LIBSPID_IMAGE_DESC_TYPE_0, - LIBSPID_IMAGE_DESC_TYPE_1, - LIBSPID_IMAGE_DESC_TYPE_CURRENT, - LIBSPID_IMAGE_DESC_TYPE_ALTERNATE, - LIBSPID_IMAGE_DESC_TYPE_NB -} libspid_image_desc_type_t; - -libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram); -libspid_error_t libspid_image_get_desc(libspid_image_desc_type_t type, spidcom_image_desc_t *image_desc, char *mtd_name); - -#endif /* LIBSPID_STUB_H */ - diff --git a/cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c b/cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c deleted file mode 100644 index 18193d5272..0000000000 --- a/cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c +++ /dev/null @@ -1,16 +0,0 @@ -/* SPC300-eoc bundle {{{ - * - * Copyright (C) 2009 Spidcom - * - * <<>> - * - * }}} */ -/** - * \file devkit/tests/managerd/utests/override/src/libmme_stub.c - * \brief Stub functions for some libmme functions used in managerd daemon - * \ingroup onlined - * - * Functions definition - */ - - diff --git a/cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c b/cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c index 3df38be61c..e23375cbe3 100644 --- a/cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c +++ b/cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c @@ -20,9 +20,9 @@ #include #include #include -#include "../../../../application/libspid/inc/path.h" #include -#include "libspid_stub.h" +#include "path.h" +#include "libspid.h" #include "managerd.h" static int test_nr; @@ -58,6 +58,16 @@ libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram) return LIBSPID_SUCCESS; } +void libspid_system_reboot(void) +{ +} + +libspid_error_t +libspid_image_get_index (const char *mtd_path, int *index) +{ + return LIBSPID_ERROR_NOT_FOUND; +} + /* as each unit test is independant, you should not have a common * test_nb variable between all test files but stub this function for * each test file -- cgit v1.2.3