diff options
| author | Teodor Mircea Ionita <teodor@mariadb.org> | 2018-05-07 22:40:27 +0300 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <cvicentiu@gmail.com> | 2018-06-10 10:14:31 +0300 |
| commit | d39629f01ebdd5b89186e6c8a4a8d3dd528bd26a (patch) | |
| tree | a9df82b6096d135fd8a33f9e372220f2cb712d44 /CMakeLists.txt | |
| parent | 0e6d6354bf32ac26d36a5a1bb854f2b22de3a494 (diff) | |
| download | mariadb-git-d39629f01ebdd5b89186e6c8a4a8d3dd528bd26a.tar.gz | |
MDEV-16075: Workaround to run MTR test suite for make test
Assign all tests added via MY_ADD_TEST to a bogus default_ignore target,
so that they are not ran by default when doing bare make test. Add default
test named MTR that calls mysql-test-run suite, which is now the single
test run by make test.
In consequence, modified unit/suite.pm to exclude the MTR test and run the
real ctests flagged for default_ignore target, thus no circular
loop.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ab17ebf64c..21ed1fcc24b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,6 +366,10 @@ 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) |