summaryrefslogtreecommitdiff
path: root/mysql-test/suite/unit
diff options
context:
space:
mode:
authorTeodor Mircea Ionita <teodor@mariadb.org>2018-05-07 22:40:27 +0300
committerVicențiu-Marian Ciorbaru <cvicentiu@gmail.com>2018-06-10 10:14:31 +0300
commitd39629f01ebdd5b89186e6c8a4a8d3dd528bd26a (patch)
treea9df82b6096d135fd8a33f9e372220f2cb712d44 /mysql-test/suite/unit
parent0e6d6354bf32ac26d36a5a1bb854f2b22de3a494 (diff)
downloadmariadb-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 'mysql-test/suite/unit')
-rw-r--r--mysql-test/suite/unit/suite.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm
index 78d82ccb31d..43eaa970350 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 --show-only --verbose`;
+ my (@ctest_list)= `cd .. && ctest $opt_vs_config -E MTR -C default_ignore --show-only --verbose`;
return "No ctest" if $?;
my ($command, %tests);