summaryrefslogtreecommitdiff
path: root/mysql-test/t/file_contents.test
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-01-28 21:22:14 +0100
committerunknown <knielsen@knielsen-hq.org>2012-01-28 21:22:14 +0100
commitf923073f681aaae634e915489d50c24c19320bb4 (patch)
treeeeb245e1eeb3caa630986c72a36916a4ec7e0478 /mysql-test/t/file_contents.test
parent300ec4d25ea7c5d933acabe2f9d4cc1e11da537b (diff)
downloadmariadb-git-f923073f681aaae634e915489d50c24c19320bb4.tar.gz
Add INFO_SRC and INFO_BIN to .deb packaging to fix a test failure in
file_contents.test. Also fix some old references to 5.3 in .deb packaging found while debugging this.
Diffstat (limited to 'mysql-test/t/file_contents.test')
-rw-r--r--mysql-test/t/file_contents.test5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
index 56901e1e10f..87c1b76f15c 100644
--- a/mysql-test/t/file_contents.test
+++ b/mysql-test/t/file_contents.test
@@ -29,8 +29,9 @@ if ($dir_bin eq '/usr/') {
# SuSE: "packages/" in the documentation path
$dir_docs = glob "$dir_docs/packages/MySQL-server*";
} else {
- # RedHat: version number in directory name
- $dir_docs = glob "$dir_docs/MySQL-server*";
+ # RedHat/Debian: version number in directory name
+ $dir_docs = glob "$dir_docs/mariadb-server-*";
+ $dir_docs = glob "$dir_docs/MySQL-server*" unless -d $dir_docs;
}
} else {
# tar.gz package, Windows, or developer work (in BZR)