Fixed: #6, #7, code stype, OSX build; added: test cases;

Author: dedok

.gitignore

@@ -1,11 +1,16 @@
+.DS_Store
+
 *.o
 *.lib
 *.a
 *.so
 *.so.*
 *.dylib
 
-test/out
 build
 CMakeCache.txt
 CMakeFiles
+Makefile
+*.snap
+*.xlog
+cmake_install.cmake

CMakeLists.txt

@@ -11,10 +11,21 @@ include_directories(${TARANTOOL_INCLUDE_DIRS})
 find_package(Mosquitto REQUIRED)
 include_directories(${MOSQUITTO_INCLUDE_DIRS})
 
+message(STATUS "tarantool: ${TARANTOOL_INCLUDE_DIRS}")
+message(STATUS "libmosquitto: ${MOSQUITTO_INCLUDE_DIRS} ${MOSQUITTO_LIBRARIES}")
+
 # Set CFLAGS
-set(MY_C_FLAGS "-Wall -Wextra -Werror -pedantic -std=gnu99")
+set(MY_C_FLAGS "-Wall -Wextra -Werror -std=gnu11 -fno-strict-aliasing")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${MY_C_FLAGS}")
 
+include_directories(${TARANTOOL_INCLUDE_DIRS}
+                    ${MOSQUITTO_INCLUDE_DIRS})
+
 # Build module
 add_subdirectory(mqtt)
+
+add_custom_target(test
+                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/run.sh
+                  DEPENDS driver)

bootstrap.sh

@@ -1,18 +1,24 @@
 #!/bin/bash
 
-set -e
+set -e -x
 
+# Deps
 cd third_party
 ./bootstrap.sh
 cd -
 
-mkdir -p build
+# Common
+rm -r build && mkdir -p build && cd build
 
-cd build
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  LIBS=$PWD/../third_party/mosquitto/build/lib/libmosquitto.dylib
+else
+  LIBS=$PWD/../third_party/mosquitto/build/lib/libmosquitto.so
+fi
 
 cmake \
   -DMOSQUITTO_INCLUDE_DIR=$PWD/../third_party/mosquitto/lib/mosquitto.h \
-  -DMOSQUITTO_LIBRARY=$PWD/../third_party/mosquitto/build/lib/libmosquitto.so \
+  -DMOSQUITTO_LIBRARY=${LIBS}\
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 ../
 

mqtt/CMakeLists.txt

@@ -1,6 +1,16 @@
+# driver
+
 add_library(driver SHARED driver.c)
+
+set(LDFLAGS_EX "")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+  set(LDFLAGS_EX ${LDFLAGS_EX} "-undefined dynamic_lookup")
+endif()
+
 message(STATUS ${MOSQUITTO_LIBRARIES})
-target_link_libraries(driver ${MOSQUITTO_LIBRARIES} -rdynamic)
+
+target_link_libraries(driver ${MOSQUITTO_LIBRARIES} ${LDFLAGS_EX} -rdynamic)
 set_target_properties(driver PROPERTIES PREFIX "" OUTPUT_NAME "driver")
+
 install(TARGETS driver LIBRARY DESTINATION ${TARANTOOL_INSTALL_LIBDIR}/mqtt)
 install(FILES init.lua DESTINATION ${TARANTOOL_INSTALL_LUADIR}/mqtt)