From 0a9d78f51d74be7708f2efd940311bf7b33108e9 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 20 Jun 2018 23:27:23 +0200
Subject: [PATCH 1/2] 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.
---
 CMakeLists.txt                 | 4 ----
 cmake/ctest.cmake              | 2 +-
 mysql-test/suite/unit/suite.pm | 2 +-
 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)

From 2b8f2b3e882f7ea93c6743f2ad717f968bd245fe Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 20 Jun 2018 23:30:49 +0200
Subject: [PATCH 2/2] Fix unit suite on Windows and in out-of-source builds

---
 mysql-test/suite/unit/suite.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm
index 78d82ccb31d..ce7ccefe926 100644
--- a/mysql-test/suite/unit/suite.pm
+++ b/mysql-test/suite/unit/suite.pm
@@ -28,10 +28,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 --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);