From 09c5a834162d0150b1680052e2cd037fdbc53e00 Mon Sep 17 00:00:00 2001
From: "guilhem@gbichot3.local" <>
Date: Fri, 15 Sep 2006 15:15:24 +0200
Subject: [PATCH] WL#3504 "plugin actions for engines' and plugins' unit tests"
 for push in 5.1 (I will inform Trudy). Storage engines and plugins can now
 have unit tests to test their components; such test must be an executable
 C/C++ program which name ends with '-t' and which is obeys the mytap
 protocol, it must be stored in the storage engine's or plugin's source
 directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
 this. The top-level Makefile target "test-unit" will run all unit tests: it
 will scan the engines' and plugins' directories, recursively, and execute all
 executable files which name ends with '-t'."

---
 Makefile.am                 |  4 ++--
 config/ac-macros/plugins.m4 | 12 ++++++++++--
 unittest/Makefile.am        |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 771a9570950..a0d19e8271d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,11 +24,11 @@ EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
 SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack \
-			@sql_union_dirs@ storage plugin \
+			@sql_union_dirs@ unittest storage plugin \
 			@sql_server@ scripts @man_dirs@ tests \
 			netware @libmysqld_dirs@ \
 			mysql-test support-files @tools_dirs@ \
-			unittest win
+			win
 
 DIST_SUBDIRS =		$(SUBDIRS) BUILD
 
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4
index cfc5f8dbcbe..87f057e696a 100644
--- a/config/ac-macros/plugins.m4
+++ b/config/ac-macros/plugins.m4
@@ -280,6 +280,8 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[
     _MYSQL_EMIT_PLUGIN_ACTIONS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
     AC_SUBST([mysql_se_dirs])
     AC_SUBST([mysql_pg_dirs])
+    AC_SUBST([mysql_se_unittest_dirs])
+    AC_SUBST([mysql_pg_unittest_dirs])
    ])
  ])
 ])
@@ -410,9 +412,15 @@ dnl Although this is "pretty", it breaks libmysqld build
           [AC_CONFIG_FILES($6/Makefile)]
         )
         ifelse(m4_substr($6, 0, 8), [storage/],
-          [mysql_se_dirs="$mysql_se_dirs ]m4_substr($6, 8)",
+          [
+            [mysql_se_dirs="$mysql_se_dirs ]m4_substr($6, 8)"
+             mysql_se_unittest_dirs="$mysql_se_unittest_dirs ../$6"
+          ],
           m4_substr($6, 0, 7), [plugin/],
-          [mysql_pg_dirs="$mysql_pg_dirs ]m4_substr($6, 7)",
+          [
+            [mysql_pg_dirs="$mysql_pg_dirs ]m4_substr($6, 7)"
+             mysql_pg_unittest_dirs="$mysql_pg_unittest_dirs ../$6"
+          ],
           [AC_FATAL([don't know how to handle plugin dir ]$6)])
       fi
     ])
diff --git a/unittest/Makefile.am b/unittest/Makefile.am
index f2f7fc0bf7d..7f1dd525d3b 100644
--- a/unittest/Makefile.am
+++ b/unittest/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS      = mytap . mysys examples
 EXTRA_DIST = unit.pl
 CLEANFILES = unit
 
-unittests = mytap mysys
+unittests = mytap mysys @mysql_se_unittest_dirs@  @mysql_pg_unittest_dirs@
 
 test:
 	perl unit.pl run $(unittests)