From: Bjorn Munch
Date: May 31 2011 1:52pm
Subject: bzr commit into mysql-5.5 branch (bjorn.munch:3416) Bug#12607800
List-Archive: http://lists.mysql.com/commits/138457
X-Bug: 12607800
Message-Id: <201105311352.p4VDq8rt019844@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1781434405=="

--===============1781434405==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/plpldef-55/ based on revid:jimmy.yang@stripped

 3416 Bjorn Munch	2011-05-31
      Bug #12607800 ADD HOOK TO INSTALL TESTS FROM IMPORTED FEATURE TREES
      Sets INSTALL_PLUGINTESTDIR if any plugin/*/tests exist

    modified:
      cmake/install_layout.cmake
=== modified file 'cmake/install_layout.cmake'
--- a/cmake/install_layout.cmake	2010-11-25 00:21:28 +0000
+++ b/cmake/install_layout.cmake	2011-05-31 13:51:00 +0000
@@ -99,6 +99,13 @@ IF(UNIX)
 ENDIF()
 
 #
+# plugin_tests's value should not be used by imported plugins,
+# just use if(INSTALL_PLUGINTESTDIR).
+# The plugin must set its own install path for tests
+#
+FILE(GLOB plugin_tests plugin/*/tests)
+
+#
 # STANDALONE layout
 #
 SET(INSTALL_BINDIR_STANDALONE           "bin")
@@ -122,6 +129,7 @@ SET(INSTALL_SQLBENCHDIR_STANDALONE
 SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
 #
 SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
+SET(INSTALL_PLUGINTESTDIR_STANDALONE    ${plugin_tests})
 
 #
 # RPM layout
@@ -152,6 +160,7 @@ SET(INSTALL_SQLBENCHDIR_RPM
 SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mysql")
 #
 SET(INSTALL_MYSQLDATADIR_RPM            "/var/lib/mysql")
+SET(INSTALL_PLUGINTESTDIR_R             ${plugin_tests})
 
 #
 # DEB layout
@@ -177,6 +186,7 @@ SET(INSTALL_SQLBENCHDIR_DEB
 SET(INSTALL_SUPPORTFILESDIR_DEB         "support-files")
 #
 SET(INSTALL_MYSQLDATADIR_DEB            "data")
+SET(INSTALL_PLUGINTESTDIR_DEB           ${plugin_tests})
 
 #
 # SVR4 layout
@@ -202,6 +212,7 @@ SET(INSTALL_SQLBENCHDIR_SVR4
 SET(INSTALL_SUPPORTFILESDIR_SVR4        "support-files")
 #
 SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
+SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
 
 
 # Clear cached variables if install layout was changed
@@ -216,7 +227,7 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT}
 # will be defined  as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
 # layout is chosen)
 FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
-  INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA)
+  INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST)
   SET(INSTALL_${var}DIR  ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
   CACHE STRING "${var} installation directory" ${FORCE})
   MARK_AS_ADVANCED(INSTALL_${var}DIR)


--===============1781434405==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/plpldef-55/
# testament_sha1: 94dd526883e8c087057e135a9dc805beeef02ec1
# timestamp: 2011-05-31 15:52:08 +0200
# base_revision_id: jimmy.yang@stripped\
#   az0yyt0m8pjioaf0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfAg4FMAAdbfgEGwXPf/93/v
/yC//9/6UASOj3unhNt3nd3Xu2WQyRNTZBT1Rv0o8k9MSmmCPKbU/KnqbE1NMR6mDRGQaSYTKeCa
TTJoQMmgAAANAAAAyCBAmqeymo9TMkejKNGnqaAMEAAHqAYqaYiniNT00ygaMgaBoaGgAAND1ACS
SNCNDKGmagyaZDTQ02oANAAAGhk6GTDZGiyP5tFFNSpvGmitgxRtlgAzxEHyZDZBaqdTcCNdSAdu
DDkb4PvdsySJy+ZM8LkEFnKWeCBYVArzLidC5Wxd/1oToo02sVu3a6tOlVuzD+5Nj+7+8MCsEzYl
Y4Itq/FzmcbmwiKFywtcNnCuuvI/pCkB5SK8199+5VFYA2D2AXzYtQZ7ha87QRHAC2c205nW3C5w
wGQkNAGAoN1FL4NQkrhJGqXM4cKGad4FMg4YE0kY5nFNYe9BE+SAjZX8ZULgdLzQbprBvUMTeD/T
15SaWKFRtnYBcOEusIDFaO5uqjkiIGRBwMLfqMtDjWzMxVuZW60+EFWHgH3NVAar9AbqTyRrFetB
vM4omdSy1oAadGCjfiO6wUjIgnEOGFVQk1yASNW6MpUo0EE4cBA3mcyEwrA1WsclhICaFCZy7dhj
HUKAsTQFBBwtSQhJr4mdihARGME4MM+kFEgLSTeDXqrgMJgulSQWiGojd3z0VSlGcRCEhKbing8K
CVckKrEB+BM4rg97Rii2DCUHay555m1BGN19GA63OmfGvIWWCkQAv1wPcBoQDXKGFQpPMq2Y72Jt
R4lrnElKCSREwIzS3yjZbTNiGTNy5YdR4ydtnMpPSiKOfJaAg9b8g+0Wk0OjdUCtcOvlkn1pdR9V
knIHsArnZKywn0ystBAMI9ybYNyWwfIpJcmWEtBc98ZzYmoIii5a03T+bQ2wFYem8SHj6RVGMAoC
SDVgP+wcWEVikusLXATFAThhMmbIHgsCWqTKIuCh0cW+R4j4a0I8Tgxqne58uVIliyrHWeGIOiwH
dM6aLvVvqmRVEapjzoOWcaLs3R0igKZNqzhoRvojOQgaNbhYI/8xSbxAxUohI6pkIMtDxGKEVNZr
jkO4GFSy2WoWgwfBkVr97vASAWYdWeUpBGnRlyV15TTOcBQ4S7F51si1c3YMWGJzG+VHgDlDHGy7
SNOYOQH2zAw1wMZYpbkbOUm45NjCQjqDjDRXtMtm8Jtc0xYIlKhwifQ1XYGAoCHJL4ihmADBv4RL
9M5RjxjGMUmASFg4jvoCgEql5MqdtT4XF4WyYM0t/DFiMgpVhTU3Uql0vBeLtwJdYK4OcDFhbLrR
khCNyuo4nvbDACN8EIXwazghkAtl9yYVRUu4XmJwqBkXnmWjE0YN3kVEBmt8EJcBkY2vgRZQzJlD
gjN8UKqzgnBcxwkeZI2gcngWiA4Z5MZnpVaRUArdjOg5xH8AqBFNS6gG7JUUSb7CG6cgdqJ5IpZJ
UDC1ANI/kKlgbbEsi0lKygCCIX1FDIVQgkBkDPCrPXfARRqhRQbA9DWaljFMMwOKKG2VwqArAS5M
iGDlQGvpxoCMoqx9OcnaKrw3DIqQ2cFbjQXgZsNTODRQNOOii1FOE8XZsPAdZU3BHFb+CyH+LuSK
cKEh4EHApg==


--===============1781434405==--