hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Esa Korhonen
2020-03-02 14:04:20 +02:00
parent 4e5d9099ed 96ba2da40c
commit 84f091987b
62 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/utilities.cmake
View File

@ -26,7 +26,7 @@ set(TIMEOUT 3600)
function(add_test_executable source name template)
add_template(${name} ${template} "${ARGV}")
add_executable(${name} ${source})
target_link_libraries(${name} testcore)
target_link_libraries(${name} maxtest)
add_test(NAME ${name} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name} ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
list(REMOVE_AT ARGV 0 1 2 3)
@ -42,7 +42,7 @@ endfunction()
function(add_test_executable_notest source name template)
add_template(${name} ${template} "${ARGV}")
add_executable(${name} ${source})
target_link_libraries(${name} testcore)
target_link_libraries(${name} maxtest)
endfunction()
# Add a test which uses another test as the executable