diff options
| author | Jonathan Perkin <jperkin@sun.com> | 2009-08-21 13:58:33 +0200 |
|---|---|---|
| committer | Jonathan Perkin <jperkin@sun.com> | 2009-08-21 13:58:33 +0200 |
| commit | 4a76122f43fe42074ec0f2f3c9b6a88fff2d9c43 (patch) | |
| tree | 45aa071ce65ec2c6d9e3e8b682bc81e9e6c5449e | |
| parent | a0169ebb039baa9bbc36eba103d36bb61e0e257c (diff) | |
| download | mariadb-git-4a76122f43fe42074ec0f2f3c9b6a88fff2d9c43.tar.gz | |
Apply patch from bug#46834 to install the test suite in RPMs.
| -rw-r--r-- | mysql-test/Makefile.am | 3 | ||||
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/Makefile.am | 3 | ||||
| -rw-r--r-- | storage/ndb/test/run-test/Makefile.am | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 6 |
4 files changed, 11 insertions, 4 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 810bead1adc..b1d0e85c70e 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -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 \ diff --git a/mysql-test/lib/My/SafeProcess/Makefile.am b/mysql-test/lib/My/SafeProcess/Makefile.am index 623c0e9a87a..722331453fe 100644 --- a/mysql-test/lib/My/SafeProcess/Makefile.am +++ b/mysql-test/lib/My/SafeProcess/Makefile.am @@ -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 diff --git a/storage/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am index 65aa62d11f0..54ca0c009b2 100644 --- a/storage/ndb/test/run-test/Makefile.am +++ b/storage/ndb/test/run-test/Makefile.am @@ -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 diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 081489f7053..8a181375cfb 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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@mysql.com> - Correct yesterday's fix, so that it also works for the last flag, |