mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Bug #11751935 42969: PLEASE ADD A MANIFEST TO EACH BUILD
post-push fix: make it work in out-of-source builds. mysql-test/mysql-test-run.pl: Set MYSQL_BINDIR, to be used by tests. mysql-test/t/file_contents.test: Use MYSQL_BINDIR, which is different from MYSQL_LIBDIR for out-of-source builds.
This commit is contained in:
@@ -2160,6 +2160,7 @@ sub environment_setup {
|
||||
$ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
|
||||
$ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
|
||||
$ENV{'MYSQL_LIBDIR'}= "$basedir/lib";
|
||||
$ENV{'MYSQL_BINDIR'}= "$bindir";
|
||||
$ENV{'MYSQL_SHAREDIR'}= $path_language;
|
||||
$ENV{'MYSQL_CHARSETSDIR'}= $path_charsetsdir;
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
--perl
|
||||
print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
|
||||
$dir_docs = $ENV{'MYSQL_LIBDIR'};
|
||||
$dir_docs = $ENV{'MYSQL_BINDIR'};
|
||||
if($dir_docs =~ m|/usr/|) {
|
||||
# RPM package
|
||||
$dir_docs =~ s|/lib|/share/doc|;
|
||||
|
||||
Reference in New Issue
Block a user