diff options
| author | MySQL Build Team <build@mysql.com> | 2009-10-05 20:14:43 +0200 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2009-10-05 20:14:43 +0200 |
| commit | 9e772dc5dab9e7b96bbfc2c9b45f2c8e7f05be56 (patch) | |
| tree | 440e670179c2e6caf755156e5e77a6c7875ef881 | |
| parent | 460c6c976e1d50925e8813123641dbac4986f7d0 (diff) | |
| download | mariadb-git-mysql-5.1.37sp1.tar.gz | |
Add fixes for Bug#46834: Test suite missing from RPMsmysql-5.1.37sp1
Additional changes from the following commits:
http://lists.mysql.com/commits/81279
http://lists.mysql.com/commits/81607
These were missed when scanning 'bzr log' for changes.
| -rw-r--r-- | mysql-test/Makefile.am | 3 | ||||
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/Makefile.am | 3 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 3 | ||||
| -rw-r--r-- | storage/ndb/test/run-test/Makefile.am | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 4 |
5 files changed, 12 insertions, 4 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 7a56584190d..c183553f963 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/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 2a7b07debd0..841def4d0ad 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -239,7 +239,8 @@ sub collect_one_suite($) 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" 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 5b8d7a5922d..bd2098b1aca 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -886,6 +886,10 @@ fi - Update variable used for mysql-test suite location to match source. +* 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, |