Merge branch 'MXS-329-develop-20151111' into develop

This commit is contained in:
Markus Makela
2015-11-13 17:26:34 +02:00
57 changed files with 1654 additions and 1053 deletions

View File

@ -1,6 +1,6 @@
add_executable(testlog testlog.c)
add_executable(testorder testorder.c)
target_link_libraries(testlog pthread log_manager utils)
target_link_libraries(testorder pthread log_manager utils)
add_executable(testorder testorder.c ../../server/core/random_jkiss.c)
target_link_libraries(testlog pthread log_manager utils fullcore)
target_link_libraries(testorder pthread log_manager utils fullcore)
add_test(NAME Internal-TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh 200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log)
add_test(Internal-TestLog testlog)