From a8e1fa173e1f8eadb49ac51050730c9212daa4cc Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 22 May 2014 11:08:14 +0200
Subject: fix file_contents to pass with git

---
 mysql-test/t/file_contents.test | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'mysql-test/t/file_contents.test')

diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
index f52f0a93c82..7592cb9420d 100644
--- a/mysql-test/t/file_contents.test
+++ b/mysql-test/t/file_contents.test
@@ -17,21 +17,21 @@ if ($dir_bin eq '/usr/') {
   $dir_docs =~ s|/lib|/share/doc|;
   if(-d "$dir_docs/packages") {
     # SuSE: "packages/" in the documentation path
-    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
+    $dir_docs = glob "$dir_docs/packages/MariaDB-server*";
   } else {
     # RedHat: version number in directory name
-    $dir_docs = glob "$dir_docs/MySQL-server*";
+    $dir_docs = glob "$dir_docs/MariaDB-server*";
   }
 } elsif ($dir_bin eq '/usr') {
   # RPM build during development
   $dir_docs = "$dir_bin/share/doc";
   if(-d "$dir_docs/packages") {
     # SuSE: "packages/" in the documentation path
-    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
+    $dir_docs = glob "$dir_docs/packages/MariaDB-server*";
   } else {
     # 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;
+    $dir_docs = glob "$dir_docs/MariaDB-server*" unless -d $dir_docs;
   }
   # Slackware
   $dir_docs = glob "$dir_bin/doc/mariadb-[0-9]*" unless -d $dir_docs;
@@ -44,12 +44,13 @@ if ($dir_bin eq '/usr/') {
     $dir_docs = "$dir_docs/Docs"; # development tree
   }
 }
-$found_version = "No line 'MySQL source #.#.#' in $dir_docs/INFO_SRC";
+$found_version = "No line 'MariaDB source #.#.#' in $dir_docs/INFO_SRC";
 $found_revision = "No line 'revision-id: .....' in $dir_docs/INFO_SRC";
 open(I_SRC,"<","$dir_docs/INFO_SRC") or print "Cannot open 'INFO_SRC' in '$dir_docs' (starting from bindir '$dir_bin')\n";
 while(defined ($line = <I_SRC>)) {
-  if ($line =~ m|^MySQL source \d+\.\d\.\d+|) {$found_version = "Found MySQL version number";}
-  if ($line =~ m|^revision-id: .*@.*-2\d{13}-\w+$|) {$found_revision = "Found BZR revision id";}
+  if ($line =~ m|^MariaDB source \d+\.\d\.\d+|) {$found_version = "Found MariaDB version number";}
+  if ($line =~ m|^revision-id: .*@.*-2\d{13}-\w+$|) {$found_revision = "Found revision id";}
+  if ($line =~ m|^commit: \w{40}$|) {$found_revision = "Found revision id";}
 }
 close I_SRC;
 print "INFO_SRC: $found_version / $found_revision\n";
-- 
cgit v1.2.1