Commit cdbd13a2 authored by unknown's avatar unknown

Fix mysql-test-run.pl so that mysql_client_test works in a CMake build tree.


mysql-test/mysql-test-run.pl:
  Also look for the mysql_test_run binary in the places where it is put
  by CMake builds.
parent f19b2c0a
...@@ -1075,6 +1075,8 @@ sub executable_setup () { ...@@ -1075,6 +1075,8 @@ sub executable_setup () {
} }
$exe_mysql_client_test= $exe_mysql_client_test=
mtr_exe_exists("$glob_basedir/tests/mysql_client_test", mtr_exe_exists("$glob_basedir/tests/mysql_client_test",
"$glob_basedir/tests/release/mysql_client_test",
"$glob_basedir/tests/debug/mysql_client_test",
"$path_client_bindir/mysql_client_test", "$path_client_bindir/mysql_client_test",
"/usr/bin/false"); "/usr/bin/false");
} }
...@@ -1138,6 +1140,8 @@ sub executable_setup () { ...@@ -1138,6 +1140,8 @@ sub executable_setup () {
$exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest"); $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
$exe_mysql_client_test= $exe_mysql_client_test=
mtr_exe_exists("$path_client_bindir/mysql_client_test", mtr_exe_exists("$path_client_bindir/mysql_client_test",
"$glob_basedir/tests/release/mysql_client_test",
"$glob_basedir/tests/debug/mysql_client_test",
"/usr/bin/false"); # FIXME temporary "/usr/bin/false"); # FIXME temporary
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment