List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:February 7 2011 11:50am
Subject:bzr commit into mysql-5.5-bugteam branch (joerg:3212) Bug#42969
View as plain text  
#At file:///MySQL/REPO/V55/bug42969-5.5/ based on revid:joerg@stripped

 3212 Joerg Bruehe	2011-02-07
      Bug #42969  	Please add a MANIFEST to each build
      First attempt at a test that will verify the existence
      of both "INFO_SRC" and "INFO:_BIN", as well as (some of)
      their expected (invariant) contents.
      However, this may still need some directory name polishing
      when it is checked on all of our supported platforms.
     @ mysql-test/t/mysql.test
        The patterns searched must match the file creation
        in boh local developer and release builds.
        Path name construction may need changes.

=== modified file 'mysql-test/r/mysql.result'
--- a/mysql-test/r/mysql.result	2010-12-01 06:58:21 +0000
+++ b/mysql-test/r/mysql.result	2011-02-07 11:50:19 +0000
@@ -502,4 +502,8 @@ Tables_in_connected_db
 DROP DATABASE connected_db;
+Checking 'INFO_SRC' and 'INFO_BIN'
+INFO_SRC: Found MySQL version number / Found BZR revision id
+INFO_BIN: Found 'Compiler flags' line / Found 'Feature flags' line
 End of tests

=== modified file 'mysql-test/t/mysql.test'
--- a/mysql-test/t/mysql.test	2010-12-01 06:58:21 +0000
+++ b/mysql-test/t/mysql.test	2011-02-07 11:50:19 +0000
@@ -568,5 +568,35 @@ DROP DATABASE connected_db;
 --remove_file $MYSQLTEST_VARDIR/tmp/one_db_1.sql
 --remove_file $MYSQLTEST_VARDIR/tmp/one_db_2.sql
+# Bug #42969: Create MANIFEST files
+# Use a Perl script to verify that files "docs/INFO_BIN" and "docs/INFO_SRC" do exist
+# and have the expected contents.
+print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
+$dir_docs = $ENV{'MYSQL_LIBDIR'};
+$dir_docs =~ s|/lib|/docs|;
+$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";
+while(defined ($line = <I_SRC>)) {
+  if ($line =~ m|^MySQL source \d\.\d\.\d+|) {$found_version = "Found MySQL version number";}
+  if ($line =~ m|^revision-id: |) {$found_revision = "Found BZR revision id";}
+close I_SRC;
+print "INFO_SRC: $found_version / $found_revision\n";
+$found_compiler = "No line 'Compiler flags'";
+$found_features = "No line 'Feature flags'";
+open(I_BIN,"<","$dir_docs/INFO_BIN") or print "Cannot open 'INFO_BIN' in '$dir_docs'\n";
+while(defined ($line = <I_BIN>)) {
+  if ($line =~ m| Compiler flags used |) {$found_compiler = "Found 'Compiler flags' line";}
+  if ($line =~ m| Feature flags used:|) {$found_features = "Found 'Feature flags' line";}
+close I_BIN;
+print "INFO_BIN: $found_compiler / $found_features\n";
 --echo End of tests

Attachment: [text/bzr-bundle] bzr/
bzr commit into mysql-5.5-bugteam branch (joerg:3212) Bug#42969Joerg Bruehe7 Feb
  • Re: bzr commit into mysql-5.5-bugteam branch (joerg:3212) Bug#42969Guilhem Bichot10 Feb
    • Re: bzr commit into mysql-5.5-bugteam branch (joerg:3212) Bug#42969Joerg Bruehe10 Feb