From ea46a936120fc8e543b7380a97ca945c65e25a2b Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Mon, 21 Oct 2013 16:29:24 +0400 Subject: [PATCH] MDEV-5127 - Test suite test file_contents fails in Slackware Linux Slackware install docs to different folder, which wasn't handled by file_contents test properly. E.g. on Redhat/Debian docs are expected to be in /usr/share/doc/mariadb-server-(version), but on Slackware they are in /usr/doc/mariadb-(version). For details see Slackware mariadb build script: http://slackbuilds.org/slackbuilds/14.0/system/mariadb/mariadb.SlackBuild --- mysql-test/t/file_contents.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test index 87c1b76f15c..48189aa33a3 100644 --- a/mysql-test/t/file_contents.test +++ b/mysql-test/t/file_contents.test @@ -33,6 +33,8 @@ if ($dir_bin eq '/usr/') { $dir_docs = glob "$dir_docs/mariadb-server-*"; $dir_docs = glob "$dir_docs/MySQL-server*" unless -d $dir_docs; } + # Slackware + $dir_docs = glob "$dir_bin/doc/mariadb-[0-9]*" unless -d $dir_docs; } else { # tar.gz package, Windows, or developer work (in BZR) $dir_docs = $dir_bin;