diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-20 23:27:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-20 23:27:23 +0200 |
| commit | 0a9d78f51d74be7708f2efd940311bf7b33108e9 (patch) | |
| tree | 4ecf312875c9c2a92a9cfc9baf75ba516303da77 | |
| parent | 170b43c1568ba6b9a772e8bdfbe90bd06cc2a345 (diff) | |
| download | mariadb-git-0a9d78f51d74be7708f2efd940311bf7b33108e9.tar.gz | |
Revert "MDEV-16075: Workaround to run MTR test suite for make test"
This reverts commit d39629f01ebdd5b89186e6c8a4a8d3dd528bd26a.
Because running mtr for many hours with no output whatsoever
is not really what we should do.
And in 5.5 `make test` just works anyway, nothing to fix here.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/ctest.cmake | 2 | ||||
| -rw-r--r-- | mysql-test/suite/unit/suite.pm | 2 | ||||
| -rw-r--r-- | unittest/sql/CMakeLists.txt | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21ed1fcc24b..6ab17ebf64c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,10 +366,6 @@ INCLUDE(maintainer) IF(WITH_UNIT_TESTS) ENABLE_TESTING() - # This is the only instance where ADD_TEST should be used, - # to make sure that make test will run MTR, - # use MY_ADD_TEST macro to add other tests - ADD_TEST(NAME MTR COMMAND ./mysql-test-run WORKING_DIRECTORY "mysql-test") ADD_SUBDIRECTORY(unittest/mytap) ADD_SUBDIRECTORY(unittest/strings) ADD_SUBDIRECTORY(unittest/examples) diff --git a/cmake/ctest.cmake b/cmake/ctest.cmake index fde7e1632f6..08852a366f6 100644 --- a/cmake/ctest.cmake +++ b/cmake/ctest.cmake @@ -2,7 +2,7 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake) MACRO(MY_ADD_TEST name) - ADD_TEST(NAME ${name} COMMAND ${name}-t CONFIGURATIONS default_ignore) + ADD_TEST(${name} ${name}-t) ENDMACRO() MACRO (MY_ADD_TESTS) diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm index 43eaa970350..78d82ccb31d 100644 --- a/mysql-test/suite/unit/suite.pm +++ b/mysql-test/suite/unit/suite.pm @@ -31,7 +31,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 --show-only --verbose`; return "No ctest" if $?; my ($command, %tests); diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt index 1efb0ac9cd1..f80f2a5ae70 100644 --- a/unittest/sql/CMakeLists.txt +++ b/unittest/sql/CMakeLists.txt @@ -26,4 +26,4 @@ ELSE() ENDIF() TARGET_LINK_LIBRARIES(explain_filename-t sql mytap) -MY_ADD_TEST(explain_filename explain_filename-t) +ADD_TEST(explain_filename explain_filename-t) |