summaryrefslogtreecommitdiff
path: root/cleopatre/devkit/tests
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-09-07 12:54:41 +0200
committerNélio Laranjeiro2012-10-10 17:08:23 +0200
commit0d107f6e1bc78ec02f888d9c60bfd215d36b4d18 (patch)
tree90e42c952a8b4f3b58786802c3e3406ffa8a9dfc /cleopatre/devkit/tests
parent84104b65809a653426c832046d23c85889c3e5fd (diff)
cleopatre/devkit/tests/{libmme, managerd}: fix tests, closes #3348
Diffstat (limited to 'cleopatre/devkit/tests')
-rw-r--r--cleopatre/devkit/tests/libmme/utests/Makefile10
-rw-r--r--cleopatre/devkit/tests/managerd/utests/Makefile9
-rw-r--r--cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c2
-rw-r--r--cleopatre/devkit/tests/managerd/utests/src/vs_mme_utests.c8
4 files changed, 24 insertions, 5 deletions
diff --git a/cleopatre/devkit/tests/libmme/utests/Makefile b/cleopatre/devkit/tests/libmme/utests/Makefile
index 740ad756b8..4dd6bf94ea 100644
--- a/cleopatre/devkit/tests/libmme/utests/Makefile
+++ b/cleopatre/devkit/tests/libmme/utests/Makefile
@@ -10,9 +10,19 @@ INCLUDES = $(PROJECT_DIR)/inc $(LINUX_PATH)/include
EXTRA_HOST_LDLIBS = -lcheck -lpthread
+MMTYPES = $(OBJ_INC_DIR)/mmtypes.h
+MMTCGEN = $(BASE)/../common/lib/mmtcgen
+COMPILE_DEPS += $(MMTYPES)
+
HOST_PROGRAMS = mme_utests
mme_utests_SOURCES = mme_utests.c
mme_utests_MODULES = $(PROJECT_DIR)
include $(BASE)/common/make/top.mk
+
+CLEAN_FILES += $(MMTYPES)
+
+-include $(MMTCGEN)/Makefile
+
+$(MMTYPES): $(OBJ_INC_DIR_STAMP)
diff --git a/cleopatre/devkit/tests/managerd/utests/Makefile b/cleopatre/devkit/tests/managerd/utests/Makefile
index 8a6b3463a8..8a22b94da8 100644
--- a/cleopatre/devkit/tests/managerd/utests/Makefile
+++ b/cleopatre/devkit/tests/managerd/utests/Makefile
@@ -18,6 +18,10 @@ EXTRA_HOST_LDLIBS = -lcheck -lpthread
DEFS = -D__UTESTS__
+MMTYPES = $(OBJ_INC_DIR)/mmtypes.h
+MMTCGEN = $(BASE)/../common/lib/mmtcgen
+COMPILE_DEPS += $(MMTYPES)
+
HOST_PROGRAMS = vs_mme_utests
vs_mme_utests_SOURCES = vs_mme_utests.c
@@ -27,3 +31,8 @@ vs_mme_utests_MODULES = $(PROJECT_DIR) $(OVERRIDE_BASE)
include $(BASE)/common/make/top.mk
+CLEAN_FILES += $(MMTYPES)
+
+-include $(MMTCGEN)/Makefile
+
+$(MMTYPES): $(OBJ_INC_DIR_STAMP)
diff --git a/cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c b/cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c
index b2c309af2d..54e543eae9 100644
--- a/cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c
+++ b/cleopatre/devkit/tests/managerd/utests/override/src/libmme_stub.c
@@ -14,7 +14,7 @@
#include <string.h>
#include "libmme.h"
-mme_error_t mme_init (mme_ctx_t *ctx, const mme_type_t mmtype, unsigned char *buffer, const unsigned int length)
+mme_error_t mme_init (mme_ctx_t *ctx, const mmtype_t mmtype, unsigned char *buffer, const unsigned int length)
{
ctx->buffer = buffer;
ctx->mmtype = mmtype;
diff --git a/cleopatre/devkit/tests/managerd/utests/src/vs_mme_utests.c b/cleopatre/devkit/tests/managerd/utests/src/vs_mme_utests.c
index c1acbee4a8..89c9c2ccb5 100644
--- a/cleopatre/devkit/tests/managerd/utests/src/vs_mme_utests.c
+++ b/cleopatre/devkit/tests/managerd/utests/src/vs_mme_utests.c
@@ -121,14 +121,14 @@ START_TEST (test_get_version_success)
memcpy (request->mme_src, "\x00\x13\xd7\x00\x00\x20", ETH_ALEN);
memcpy (request->mme_dest, BROADCAST_ADDR, ETH_ALEN);
request->mtype = htons (MME_TYPE);
- request->mmtype = MME_TYPE_VS_GET_VERSION | MME_TYPE_REQ;
+ request->mmtype = VS_GET_VERSION_REQ;
memcpy ((char *)request + sizeof(MME_t), OUI_SPIDCOM, 3);
fail_unless ((vs_mme_get_version (ctx, request, confirm, 1024) == TO_DROP)
&& !memcmp (confirm->mme_dest, request->mme_src, ETH_ALEN)
&& !memcmp (confirm->mme_src, ctx->br_mac_addr, ETH_ALEN)
&& (confirm->mtype == request->mtype)
- && (confirm->mmtype == (MME_TYPE_VS_GET_VERSION | MME_TYPE_CNF))
+ && (confirm->mmtype == VS_GET_VERSION_CNF)
&& !memcmp (get_version_cnf->oui, OUI_SPIDCOM, 3)
&& (get_version_cnf->result == 0)
&& (get_version_cnf->device_id == SPC300_ID)
@@ -219,7 +219,7 @@ START_TEST (test_eth_stats_get_success)
memcpy (request->mme_src, "\x00\x13\xd7\x00\x00\x20", ETH_ALEN);
memcpy (request->mme_dest, BROADCAST_ADDR, ETH_ALEN);
request->mtype = htons (MME_TYPE);
- request->mmtype = MME_TYPE_VS_ETH_STATS | MME_TYPE_REQ;
+ request->mmtype = VS_ETH_STATS_REQ;
memcpy (eth_stats_req->oui, OUI_SPIDCOM, 3);
eth_stats_req->command = 0; /* get command */
@@ -227,7 +227,7 @@ START_TEST (test_eth_stats_get_success)
&& !memcmp (confirm->mme_dest, request->mme_src, ETH_ALEN)
&& !memcmp (confirm->mme_src, ctx->br_mac_addr, ETH_ALEN)
&& (confirm->mtype == request->mtype)
- && (confirm->mmtype == (MME_TYPE_VS_ETH_STATS | MME_TYPE_CNF))
+ && (confirm->mmtype == VS_ETH_STATS_CNF)
&& !memcmp (eth_stats_cnf->oui, OUI_SPIDCOM, 3)
&& (eth_stats_cnf->result == MME_RESULT_SUCCESS)
&& (eth_stats_cnf->rx_bytes_low == (111111111111LL & 0xffffffff))