fix mysql-test unit suite to work for out-of-source builds

vuvova · vuvova · commit 8599f16b9d6a · 2017-03-30T09:12:33.000+02:00
diff --git 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";
+  return "Not configured to run ctest" unless -f "$bin/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 "$bin" && ctest $opt_vs_config --show-only --verbose`;
   return "No ctest" if $?;
 
   my ($command, %tests, $prefix);

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,11 @@ sub start_test {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`{`
	`40`	`+ my $bin=$ENV{MTR_BINDIR} \|\| '..';`
`40`	`41`	`return "Not run for embedded server" if $::opt_embedded_server;`
`41`		`- return "Not configured to run ctest" unless -f "../CTestTestfile.cmake";`
	`42`	`+ return "Not configured to run ctest" unless -f "$bin/CTestTestfile.cmake";`
`42`	`43`	`my ($ctest_vs)= $opt_vs_config ? "--build-config $opt_vs_config" : "";`
`43`		- my (@ctest_list)= `cd .. && ctest $opt_vs_config --show-only --verbose`;
	`44`	+ my (@ctest_list)= `cd "$bin" && ctest $opt_vs_config --show-only --verbose`;
`44`	`45`	`return "No ctest" if $?;`
`45`	`46`
`46`	`47`	`my ($command, %tests, $prefix);`