diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 00:44:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 00:44:10 +0200 |
| commit | d8192f5495ec5db99cde0cee5096bd99b6eaf01f (patch) | |
| tree | 68e5fec8804ec542455a10cb5d3b15ad59daf518 /mysql-test/suite/unit | |
| parent | 6c08ff3eb71104cf1e9cfcbe01eca4afe281ccb1 (diff) | |
| parent | 2b8f2b3e882f7ea93c6743f2ad717f968bd245fe (diff) | |
| download | mariadb-git-d8192f5495ec5db99cde0cee5096bd99b6eaf01f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/suite/unit')
| -rw-r--r-- | mysql-test/suite/unit/suite.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm index fa1da2ae4ff..48401b1579f 100644 --- a/mysql-test/suite/unit/suite.pm +++ b/mysql-test/suite/unit/suite.pm @@ -37,10 +37,11 @@ sub start_test { } { + my $bin=$ENV{MTR_BINDIR} || '..'; 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`; + return "Not configured to run ctest" unless -f "$bin/CTestTestfile.cmake"; + my ($ctest_vs)= $::opt_vs_config ? "-C ".substr($::opt_vs_config,1) : ""; + my (@ctest_list)= `cd $bin && ctest $ctest_vs --show-only --verbose`; return "No ctest" if $?; my ($command, %tests); |