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

[Jonathan Perkin]

#At file:///net/helheim/store/bteam/bzr/mysql-5.1.38-release/

 2971 Jonathan Perkin	2009-08-21
      Apply patch from bug#46834 to install the test suite in RPMs.
      modified:
        mysql-test/Makefile.am
        mysql-test/lib/My/SafeProcess/Makefile.am
        storage/ndb/test/run-test/Makefile.am
        support-files/mysql.spec.sh

=== 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-21 11:58:33 +0000
@@ -17,7 +17,8 @@
 
 ## Process this file with automake to create Makefile.in
 
-testdir =	$(prefix)/mysql-test
+testroot =	$(prefix)
+testdir =	$(testroot)/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-21 11:58:33 +0000
@@ -13,7 +13,8 @@
 # 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
+testroot = $(prefix)
+safedir = $(testroot)/mysql-test/lib/My/SafeProcess
 #nobase_bin_PROGRAMS = ...
 safe_PROGRAMS =		my_safe_process
 

=== 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-21 11:58:33 +0000
@@ -13,7 +13,8 @@
 # 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
+testroot=$(prefix)
+testdir=$(testroot)/mysql-test/ndb
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_util.mk.am

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2009-08-21 11:52:30 +0000
+++ b/support-files/mysql.spec.sh	2009-08-21 11:58:33 +0000
@@ -428,7 +428,7 @@ install -d $RBR%{_sbindir}
 
 
 # Install all binaries 
-(cd $MBD && make install DESTDIR=$RBR benchdir_root=%{_datadir})
+(cd $MBD && make install DESTDIR=$RBR testroot=%{_datadir})
 # Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
 # the same here.
 mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
@@ -858,6 +858,10 @@ fi
 - Install plugin libraries in appropriate packages.
 - Disable example plugins.
 
+* Thu Aug 20 2009 Jonathan Perkin <jperkin@stripped>
+
+- Update variable used for mysql-test suite location to match source.
+
 * Fri Nov 07 2008 Joerg Bruehe <joerg@stripped>
 
 - Correct yesterday's fix, so that it also works for the last flag,