bzr commit into mysql-5.5 branch (joerg.bruehe:3366)

[Joerg Bruehe]

#At file:///MySQL/REPO/V55/mysql-5.5/ based on revid:bjorn.munch@stripped

 3366 Joerg Bruehe	2011-03-11
      Fight a problem in internal test builds:
      
      When a RPM test build in a non-release branch is done,
      the $MYSQL_BINDIR variable ends in "/usr"
      (rather than in "/usr/lib" as in a RPM release build),
      this made test "file_contents" fail.
      
      A branch for this case is added to the test.
      The test result is unchanged.
     @ mysql-test/t/file_contents.test
        Fight a problem in internal test builds:
        
        When a RPM test build in a non-release branch is done,
        the $MYSQL_BINDIR variable ends in "/usr"
        (rather than in "/usr/lib" as in a RPM release build),
        this made test "file_contents" fail.
        
        Because of this, the old logic did not recognize
        that a RPM build is done (trailing '/' missing!)
        and took the tar.gz branch.
        Just removing the trailing '/' from the "/usr" is
        not enough, as the logic for RPMs used to replace
        "/lib" which is not present at all; rather, a new
        branch was added.
        
        To help in case of future problems, the error messages
        for a failing "open()" now also report "$MYSQL_BINDIR".

    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: |) ||


Attachment: [text/bzr-bundle] bzr/[e-mail]