List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:March 11 2011 3:07pm
Subject:bzr commit into mysql-trunk branch (joerg.bruehe:3755)
View as plain text  
#At file:///MySQL/REPO/Vtu/mysql-trunk/ based on revid:alexander.barkov@stripped

 3755 Joerg Bruehe	2011-03-11 [merge]
      Auto-upmerge a test case fix ("file_contents") from 5.5 to trunk (5.6).

    modified:
      mysql-test/t/file_contents.test
=== modified file 'mysql-test/t/file_contents.test'
--- a/mysql-test/t/file_contents.test	2011-02-16 12:44:28 +0000
+++ b/mysql-test/t/file_contents.test	2011-03-11 15:00:53 +0000
@@ -10,9 +10,10 @@
 
 --perl
 print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
-$dir_docs = $ENV{'MYSQL_BINDIR'};
-if($dir_docs =~ m|/usr/|) {
+$dir_bin = $ENV{'MYSQL_BINDIR'};
+if ($dir_bin =~ m|/usr/|) {
   # RPM package
+  $dir_docs = $dir_bin;
   $dir_docs =~ s|/lib|/share/doc|;
   if(-d "$dir_docs/packages/MySQL-server") {
     # SuSE
@@ -21,8 +22,19 @@ if($dir_docs =~ m|/usr/|) {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";
   }
+} elsif ($dir_bin =~ m|/usr$|) {
+  # RPM build during development
+  $dir_docs = "$dir_bin/share/doc";
+  if(-d "$dir_docs/packages/MySQL-server") {
+    # SuSE
+    $dir_docs = "$dir_docs/packages/MySQL-server";
+  } else {
+    # RedHat: version number in directory name
+    $dir_docs = glob "$dir_docs/MySQL-server*";
+  }
 } else {
   # tar.gz package, Windows, or developer work (in BZR)
+  $dir_docs = $dir_bin;
   $dir_docs =~ s|/lib||;
   if(-d "$dir_docs/docs") {
     $dir_docs = "$dir_docs/docs"; # package
@@ -32,7 +44,7 @@ if($dir_docs =~ m|/usr/|) {
 }
 $found_version = "No line 'MySQL source #.#.#'";
 $found_revision = "No line 'revision-id: .....'";
-open(I_SRC,"<","$dir_docs/INFO_SRC") or print "Cannot open 'INFO_SRC' in '$dir_docs'\n";
+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";}
@@ -41,7 +53,7 @@ close I_SRC;
 print "INFO_SRC: $found_version / $found_revision\n";
 $found_compiler = "No line about compiler information";
 $found_features = "No line 'Feature flags'";
-open(I_BIN,"<","$dir_docs/INFO_BIN") or print "Cannot open 'INFO_BIN' in '$dir_docs'\n";
+open(I_BIN,"<","$dir_docs/INFO_BIN") or print "Cannot open 'INFO_BIN' in '$dir_docs' (starting from bindir '$dir_bin')\n";
 while(defined ($line = <I_BIN>)) {
   # "generator" on Windows, "flags" on Unix:
   if (($line =~ m| Compiler / generator used: |) ||

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into mysql-trunk branch (joerg.bruehe:3755) Joerg Bruehe11 Mar