Merge branch '2.0' into develop

2017-02-01 09:35:13 +02:00
parent 2b950e60fd a8780b8924
commit e64a641bcd
14 changed files with 314 additions and 78 deletions
--- a/server/modules/routing/binlogrouter/test/CMakeLists.txt
+++ b/server/modules/routing/binlogrouter/test/CMakeLists.txt
@ -1,5 +1,5 @@
 if(BUILD_TESTS)
  add_executable(testbinlogrouter testbinlog.c ../blr.c ../blr_slave.c ../blr_master.c ../blr_file.c ../blr_cache.c)
  target_link_libraries(testbinlogrouter maxscale-common ${PCRE_LINK_FLAGS} uuid)
-  add_test(TestBinlogRouter ${CMAKE_CURRENT_BINARY_DIR}/testbinlogrouter)
+  add_test(NAME TestBinlogRouter COMMAND ./testbinlogrouter WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 endif()