bzr commit into mysql-5.1 branch (jperkin:2969) Bug#46834

[Jonathan Perkin]

#At file:///home/sketch/bzr/mysql-5.1-build-bug46834/ based on revid:joerg@stripped

 2969 Jonathan Perkin	2009-08-20
      bug#46834: Test suite missing from RPMs
      
      Fix regression introduced in 5.1.32 by explicitly installing the test suite
      under datadir.
      
      This restores RPMs to the previous behaviour, but changes tar builds so that
      the test suite is now in ./share/mysql-test rather than ./mysql-test.  This, I
      believe, is the more technically correct location anyway, and ensures symmetry
      across packages.

    modified:
      mysql-test/Makefile.am
      mysql-test/lib/My/SafeProcess/Makefile.am
      mysql-test/lib/mtr_cases.pm
      storage/ndb/test/run-test/Makefile.am
=== modified file 'mysql-test/Makefile.am'

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2009-07-14 10:06:04 +0000
+++ b/mysql-test/Makefile.am	2009-08-20 13:37:37 +0000
@@ -17,7 +17,7 @@
 
 ## Process this file with automake to create Makefile.in
 
-testdir =	$(prefix)/mysql-test
+testdir =	$(datadir)/mysql-test
 
 test_SCRIPTS =	mtr \
 		mysql-test-run \

=== modified file 'mysql-test/lib/My/SafeProcess/Makefile.am'
--- a/mysql-test/lib/My/SafeProcess/Makefile.am	2008-03-13 16:07:11 +0000
+++ b/mysql-test/lib/My/SafeProcess/Makefile.am	2009-08-20 13:37:37 +0000
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-safedir = $(prefix)/mysql-test/lib/My/SafeProcess
+safedir = $(datadir)/mysql-test/lib/My/SafeProcess
 #nobase_bin_PROGRAMS = ...
 safe_PROGRAMS =		my_safe_process
 

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-08-12 12:46:12 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2009-08-20 13:37:37 +0000
@@ -239,7 +239,8 @@
     else
     {
       $suitedir= my_find_dir($::basedir,
-			     ["mysql-test/suite",
+			     ["share/mysql-test/suite",
+			      "mysql-test/suite",
 			      "mysql-test",
 			      # Look in storage engine specific suite dirs
 			      "storage/*/mysql-test-suites"

=== modified file 'storage/ndb/test/run-test/Makefile.am'
--- a/storage/ndb/test/run-test/Makefile.am	2007-08-31 14:12:51 +0000
+++ b/storage/ndb/test/run-test/Makefile.am	2009-08-20 13:37:37 +0000
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-testdir=$(prefix)/mysql-test/ndb
+testdir=$(datadir)/mysql-test/ndb
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_util.mk.am


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