From: Bjorn Munch
Date: June 1 2011 10:15am
Subject: bzr commit into mysql-5.5 branch (bjorn.munch:3418) Bug#12607800
List-Archive: http://lists.mysql.com/commits/138521
X-Bug: 12607800
Message-Id: <201106011015.p51AFGVW020384@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1654820389=="

--===============1654820389==
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:vinay.fisrekar@stripped

 3418 Bjorn Munch	2011-06-01
      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-06-01 10:15:01 +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_RPM           ${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)


--===============1654820389==
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: 857aa3e4a80efd35a673ab0e0d07a6d0e7a15aab
# timestamp: 2011-06-01 12:15:16 +0200
# base_revision_id: vinay.fisrekar@stripped\
#   9dremp9hs1nr603a
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRTRAWsAAdxfgEGQXPf/93/v
/yC//9/6UASXZ4Di1pswAA0jRNT9SaNR6jRtJ6agGgaep+pHijIB6mg00ANICnpgQTZUwTIaR6AC
AYmBBjU0wcZMmhiMTRgEYCYQBgJpo0yNAMVtSmnqGmQ00aNNABiBoAAAABoCSICJpoaJkxTxI9DU
NNPVNNqZNANAPUDIm4xO2MzTIIfr+idKHimd+RQxNhBIHO0gXjmZBOY9x2LPBTXMYnIjzaNybWuM
ACLrxIlkkAwMGQpIOcWAcLQFwhJF2G+jZVr7FU7VyUZcFVS57JfOKzWz/fgxcEdqFe4yHQfuiN4U
tOELkMGbp948OFqdhLUQxEJqHh8EsswDmfwB4sHWGxjdgvERi0CsDdq767uZzusorkiasEYM8L/e
U2+SqQ1scxHLmInrmVIEBVgsEDIIyGSaJ65KUkEZEYTTb+bEoKlU4f7F5Vj4HwvSowzO6WLi5Eb7
LUlBoLz+hrvpikva0I/1VRNb2d2eTVngY6nio95/eOy0Uimtn2D/BudMpd2Noh1KRvbZFuxgVvDL
wgNMcY2ZXm0yQ8Rp11Qz5nDPQc4iyZK3XQixMd2aVLN5HEWLXEjMVtvKMqTksWx1MwwV8bGym3JU
zydhTVsCCW0sOKOMAy6vUOjx2kBMohIlU25G1S1kXXHZWsnPWMAtBUUMilIYwmlPFCylVRiTjmEL
AM8FdYhy8ocHRieSWC4MDTbkmSwLuOU4icA7BMjYdOgktSs5LrRGxMjJPXAo6Ym0ioTo01l5nns0
69Q7dPpzy8i4pd13e6XvZnKo7gChSyYesBuNtemEEu23LzOVnS6jOCJzCAzAW9Q4j0Jfn+0Lxggj
90sgs93ifyaEptDxSkJp0pYs1ZRSUn1MVcjvcHUBKom28oDzRhlJsRgAsUaYEdYQKETDkovLHEG0
MJZs9UqwYjJ5JQtbAnETLdx2o9a+vhEkJwku8930cUiMTuayIdgfViD/rnunn9v3K9Fo1X8Vlqly
Upk6a+gPCn6VO3yA7qa1jNXcH5dEchATX1KIh3yGIFXN42hQ0LHhFudSIf+RLIyC221tGUJJXct+
i9+cBQBeT+ywL/PWpUdWm+nwMeEANRWW6GJhjx1oNXojk+JPrmbDrckj0JlZpzWbjd0kUEe+oXds
lOhdqMj9hojkH+QuVToODnn2ZOS1uuWgTcTr3oYRm05nvYDWEednaKOxZQJnTeZfj4JpYHUbDpUS
J2rSwppwuhHu9TfHbopnDpMQY1vxeXlT0lvPclTcbFwDgeTaHcLFMLgdwZRU+XG1IYtm3Qy9VKSi
4jzCGOp7AvUsMRonG9SJdaWD15vWCVYEEutnZhTd1kkyThBsctSgi5DMmVNdS3kLKCmd4mP19Uyv
ySOQOpAaSC9GG72LPrBtbMmc1z2Skj5g2Ypd0T02aleoKCS6updyiinVjMwrfK1qRohfCLBpJI+b
jmR9KhkpmJX4+DmOGgHsMGgrGsLghUGQNIMWGSUCdFJ+sihttcfpvGYHNdiupjLQxA2Nr2Uopwhk
s7GEZi3D3bEvaW5SG+ihjVTKsodGHmhXaJw9nRvxPVN26oLmLwFcQiW/MNAf+LuSKcKEgKaIC1g=


--===============1654820389==--