From 84242f8829318f867277c7c725030a9b37678679 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Wed, 18 Sep 2019 15:17:40 +0200
Subject: [PATCH] test/mesh: add mesh_message_test to CMake build

---
 test/mesh/CMakeLists.txt                      | 35 ++++++++++++++++++-
 test/mesh/Makefile                            |  2 +-
 ...h_message_test.c => mesh_message_test.cpp} |  2 +-
 3 files changed, 36 insertions(+), 3 deletions(-)
 rename test/mesh/{mesh_message_test.c => mesh_message_test.cpp} (99%)

diff --git a/test/mesh/CMakeLists.txt b/test/mesh/CMakeLists.txt
index 9253bb55e..3c43712b9 100644
--- a/test/mesh/CMakeLists.txt
+++ b/test/mesh/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(../../3rd-party/micro-ecc)
 include_directories(../../3rd-party/tinydir)
 include_directories(../../src)
 include_directories(../../platform/posix)
-# include_directories(../../platform/embedded)
+include_directories(../rijndael)
 include_directories(.)
 
 file(GLOB SOURCES_SRC       "../../src/*.c"                     "../../src/*.h" "../../example/sco_demo_util.c" "../../example/sco_demo_util.h")
@@ -66,3 +66,36 @@ foreach(EXAMPLE_FILE ${EXAMPLES_C})
 	endif()
 	target_link_libraries(${EXAMPLE} btstack)
 endforeach(EXAMPLE_FILE)
+
+# create mesh_message_test target
+
+## hard-coded to use CPPUtest
+include_directories( /usr/local/include)
+link_directories( /usr/local/lib)
+link_libraries(CppUTest CppUTestExt)
+add_executable(mesh_message_test 
+../../src/mesh/mesh_foundation.c
+../../src/mesh/mesh_node.c
+../../src/mesh/mesh_iv_index_seq_number.c
+../../src/mesh/mesh_network.c
+../../src/mesh/mesh_peer.c
+../../src/mesh/mesh_lower_transport.c
+../../src/mesh/mesh_upper_transport.c
+../../src/mesh/mesh_virtual_addresses.c
+../../src/mesh/mesh_keys.c
+../../src/mesh/mesh_crypto.c
+../../src/btstack_memory.c
+../../src/btstack_memory_pool.c
+../../src/btstack_util.c
+../../src/btstack_crypto.c
+../../src/btstack_linked_list.c
+../../src/hci_dump.c
+../../src/hci_cmd.c
+../../3rd-party/micro-ecc/uECC.c
+../rijndael/rijndael.c
+mock.c
+mesh_message_test.cpp
+)
+
+
+
diff --git a/test/mesh/Makefile b/test/mesh/Makefile
index 79d1ff694..7d795bec1 100644
--- a/test/mesh/Makefile
+++ b/test/mesh/Makefile
@@ -65,7 +65,7 @@ mesh_pts: mesh_pts.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${S
 provisioner: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${SM_OBJ} pb_adv.o mesh_crypto.o provisioning_provisioner.o mesh_keys.o mesh_foundation.o mesh_network.o provisioner.o
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
 
-mesh_message_test: mesh_foundation.o mesh_node.o mesh_message_test.c mesh_iv_index_seq_number.o mesh_network.o mesh_peer.o mesh_lower_transport.o mesh_upper_transport.o mesh_virtual_addresses.o  mesh_keys.o  mesh_crypto.o btstack_memory.o btstack_memory_pool.o btstack_util.o btstack_crypto.o btstack_linked_list.o hci_dump.o uECC.o mock.o rijndael.o hci_cmd.o
+mesh_message_test: mesh_message_test.cpp mesh_foundation.o mesh_node.o  mesh_iv_index_seq_number.o mesh_network.o mesh_peer.o mesh_lower_transport.o mesh_upper_transport.o mesh_virtual_addresses.o  mesh_keys.o  mesh_crypto.o btstack_memory.o btstack_memory_pool.o btstack_util.o btstack_crypto.o btstack_linked_list.o hci_dump.o uECC.o mock.o rijndael.o hci_cmd.o
 	g++ $^ ${CFLAGS} ${LDFLAGS} -o $@
 
 sniffer: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${SM_OBJ} mesh_keys.o mesh_network.o mesh_foundation.o sniffer.c 
diff --git a/test/mesh/mesh_message_test.c b/test/mesh/mesh_message_test.cpp
similarity index 99%
rename from test/mesh/mesh_message_test.c
rename to test/mesh/mesh_message_test.cpp
index 7b1dd94f1..c797b5a27 100644
--- a/test/mesh/mesh_message_test.c
+++ b/test/mesh/mesh_message_test.cpp
@@ -16,7 +16,7 @@
 #include "mesh/mesh_network.h"
 #include "mesh/mesh_upper_transport.h"
 #include "mesh/provisioning.h"
-#include "mesh_peer.h"
+#include "mesh/mesh_peer.h"
 
 extern "C" int mock_process_hci_cmd(void);