revision-id: 08aff5adca74b1600770c0ed5f863d11eda7b2ba (mariadb-10.1.34-6-g08aff5adca7) parent(s): bb24663f5ad955a615172512c04779d219bb6645 author: Sergei Golubchik committer: Sergei Golubchik timestamp: 2018-06-20 17:25:46 +0200 message: MDEV-16075: Workaround to run MTR test suite for make test Fix unit suite on Windows. With VS all test executables should be in their corresponding VS_CONFIG, and ctest should not be invoked with two -C options. followup for d39629f01eb --- cmake/ctest.cmake | 6 +++++- mysql-test/suite/unit/suite.pm | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/ctest.cmake b/cmake/ctest.cmake index fde7e1632f6..bfb0e73c736 100644 --- a/cmake/ctest.cmake +++ b/cmake/ctest.cmake @@ -1,8 +1,12 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake) +IF(NOT WIN32) + SET(test_configuration "CONFIGURATIONS default_ignore") +ENDIF() + MACRO(MY_ADD_TEST name) - ADD_TEST(NAME ${name} COMMAND ${name}-t CONFIGURATIONS default_ignore) + ADD_TEST(NAME ${name} COMMAND ${name}-t ${test_configuration}) ENDMACRO() MACRO (MY_ADD_TESTS) diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm index fa1da2ae4ff..d0bfe00daa7 100644 --- a/mysql-test/suite/unit/suite.pm +++ b/mysql-test/suite/unit/suite.pm @@ -40,7 +40,7 @@ sub start_test { return "Not run for embedded server" if $::opt_embedded_server; return "Not configured to run ctest" unless -f "../CTestTestfile.cmake"; my ($ctest_vs)= $opt_vs_config ? "--build-config $opt_vs_config" : ""; - my (@ctest_list)= `cd .. && ctest $opt_vs_config -E MTR -C default_ignore --show-only --verbose`; + my (@ctest_list)= `cd .. && ctest $opt_vs_config -E MTR --show-only --verbose`; return "No ctest" if $?; my ($command, %tests);