Jakub Dorňák bf0a83b
diff -up --recursive mysql-5.7.8.orig/mysql-test/lib/My/ConfigFactory.pm mysql-5.7.8/mysql-test/lib/My/ConfigFactory.pm
Jakub Dorňák bf0a83b
--- mysql-5.7.8.orig/mysql-test/lib/My/ConfigFactory.pm	2015-07-20 14:25:09.000000000 +0200
Jakub Dorňák bf0a83b
+++ mysql-5.7.8/mysql-test/lib/My/ConfigFactory.pm	2015-09-23 13:51:18.655091136 +0200
1a2ec63
@@ -36,7 +36,7 @@ my @pre_rules=
1a2ec63
 );
1a2ec63
 
1a2ec63
 
1a2ec63
-my @share_locations= ("share/mysql", "sql/share", "share");
90502f1
+my @share_locations= ("@INSTALL_MYSQLSHAREDIR@", "sql/share", "share");
1a2ec63
 
1a2ec63
 
1a2ec63
 sub get_basedir {
Jakub Dorňák bf0a83b
diff -up --recursive mysql-5.7.8.orig/mysql-test/mysql-test-run.pl mysql-5.7.8/mysql-test/mysql-test-run.pl
Jakub Dorňák bf0a83b
--- mysql-5.7.8.orig/mysql-test/mysql-test-run.pl	2015-07-20 14:25:08.000000000 +0200
Jakub Dorňák bf0a83b
+++ mysql-5.7.8/mysql-test/mysql-test-run.pl	2015-09-23 13:52:50.023961144 +0200
Jakub Dorňák bf0a83b
@@ -1282,11 +1282,11 @@ sub command_line_setup {
1a2ec63
   }
1a2ec63
 
1a2ec63
   # Look for language files and charsetsdir, use same share
1a2ec63
-  $path_language=   mtr_path_exists("$bindir/share/mysql",
90502f1
+  $path_language=   mtr_path_exists("$bindir/@INSTALL_MYSQLSHAREDIR@",
1a2ec63
                                     "$bindir/sql/share",
1a2ec63
                                     "$bindir/share");
1a2ec63
   my $path_share= $path_language;
1a2ec63
-  $path_charsetsdir =   mtr_path_exists("$basedir/share/mysql/charsets",
90502f1
+  $path_charsetsdir =   mtr_path_exists("$basedir/@INSTALL_MYSQLSHAREDIR@/charsets",
1a2ec63
                                     "$basedir/sql/share/charsets",
1a2ec63
                                     "$basedir/share/charsets");
1a2ec63
 
Jakub Dorňák bf0a83b
@@ -3729,7 +3729,7 @@ sub mysql_install_db {
1a2ec63
   }
1a2ec63
 
1a2ec63
   my $path_sql= my_find_file($install_basedir,
1a2ec63
-			     ["mysql", "sql/share", "share/mysql",
90502f1
+			     ["mysql", "sql/share", "@INSTALL_MYSQLSHAREDIR@",
1a2ec63
 			      "share", "scripts"],
Jakub Dorňák bf0a83b
 			      "mysql_system_tables.sql",
1a2ec63
 			     NOT_REQUIRED);
Jakub Dorňák bf0a83b
diff -up --recursive mysql-5.7.8.orig/mysql-test/CMakeLists.txt mysql-5.7.8/mysql-test/CMakeLists.txt
Jakub Dorňák bf0a83b
--- mysql-5.7.8.orig/mysql-test/CMakeLists.txt	2015-07-20 14:25:08.000000000 +0200
Jakub Dorňák bf0a83b
+++ mysql-5.7.8/mysql-test/CMakeLists.txt	2015-09-23 13:53:57.694863067 +0200
90502f1
@@ -33,6 +33,10 @@ ENDIF()
90502f1
 
90502f1
 
90502f1
 
90502f1
+# Expand some paths in the perl scripts correctly
90502f1
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/lib/My/ConfigFactory.pm ${CMAKE_CURRENT_SOURCE_DIR}/lib/My/ConfigFactory.pm @ONLY)
90502f1
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test-run.pl @ONLY)
90502f1
+
90502f1
 IF(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
90502f1
   # Enable running mtr from build directory
90502f1
   CONFIGURE_FILE(