WL#3234 Maria control file

Fixes after Brian's and Serg's comments: storage engine's unit tests
are now in storage/<engine>/unittest instead of unittest/storage/<engine>


BitKeeper/deleted/.del-Makefile.am~78ea2e42d44d121f:
  Delete: unittest/storage/maria/Makefile.am
BitKeeper/deleted/.del-Makefile.am~80497dbf1a80bdf3:
  Delete: unittest/storage/Makefile.am
storage/maria/unittest/ma_control_file-t.c:
  Rename: unittest/storage/maria/ma_control_file-t.c -> storage/maria/unittest/ma_control_file-t.c
config/ac-macros/plugins.m4:
  we change from unittest/storage/<engine>/ to storage/<engine>/unittest:
  if the engine is enabled has such a directory, build this directory,
  and add it to the list of unit tests to run.
configure.in:
  this dir does not exist anymore
storage/maria/Makefile.am:
  to build Maria unittests, libmaria must be built.
unittest/Makefile.am:
  unittest/storage is removed. target "unitests" is defined at
  "configure" time based on enabled engines.
storage/maria/unittest/Makefile.am:
  simple Makefile.am to build ma_control_file-t

config/ac-macros/plugins.m4

@@ -411,11 +411,11 @@ dnl Although this is "pretty", it breaks libmysqld build
           [AC_CONFIG_SUBDIRS($6)],
           [
             AC_CONFIG_FILES($6/Makefile)
-            m4_syscmd(test -d "unittest/$6")
+            m4_syscmd(test -d "$6/unittest")
             ifelse(m4_sysval, 0,
             [
-              mysql_use_plugin_unittest_dir="$6"
-              AC_CONFIG_FILES(unittest/$6/Makefile)
+              mysql_use_plugin_unittest_dir="$6/unittest"
+              AC_CONFIG_FILES($6/unittest/Makefile)
             ], [])
           ]
         )
@@ -424,7 +424,7 @@ dnl Although this is "pretty", it breaks libmysqld build
             [mysql_se_name="]m4_substr($6, 8)"
             mysql_se_dirs="$mysql_se_dirs $mysql_se_name"
             if test -n "$mysql_use_plugin_unittest_dir" ; then
-              mysql_se_unittest_dirs="$mysql_se_unitest_dirs $mysql_se_name"
+              mysql_se_unittest_dirs="$mysql_se_unitest_dirs ../$mysql_use_plugin_unittest_dir"
             fi
           ],
           m4_substr($6, 0, 7), [plugin/],

configure.in

@@ -2482,7 +2482,6 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl
  unittest/mysys/Makefile unittest/examples/Makefile dnl
- unittest/storage/Makefile dnl
  strings/Makefile regex/Makefile storage/Makefile dnl
  man/Makefile BUILD/Makefile vio/Makefile dnl
  libmysql/Makefile client/Makefile dnl

storage/maria/Makefile.am

@@ -28,6 +28,9 @@ LDADD =
 
 DEFS =                  @DEFS@
 
+# "." is needed first because tests in unittest need libmaria
+SUBDIRS =		. unittest
+
 EXTRA_DIST =		ma_test_all.sh ma_test_all.res ma_ft_stem.c CMakeLists.txt
 pkgdata_DATA =		ma_test_all ma_test_all.res
 pkglib_LIBRARIES =	libmaria.a

unittest/Makefile.am

-SUBDIRS      = mytap . mysys storage examples
+SUBDIRS      = mytap . mysys examples
 
 noinst_SCRIPTS = unit
 EXTRA_DIST = unit.pl
 CLEANFILES = unit
 
-unittests = mytap mysys storage
+unittests = mytap mysys @mysql_se_unittest_dirs@
 
 test: unit
 	./unit run $(unittests)

unittest/storage/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# Process this file with automake to create Makefile.in
-
-AUTOMAKE_OPTIONS =	foreign
-
-# These are built from source in the Docs directory
-EXTRA_DIST =		
-# Cannot use @mysql_se_dirs@ as not all engines have unit tests here
-SUBDIRS = @mysql_se_unittest_dirs@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%