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

--===============1403437070==
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:10:21 +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)


--===============1403437070==
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: 8900fb3ca758d72c5eaf3f1e87123f220ca0311d
# timestamp: 2011-06-01 12:10:47 +0200
# base_revision_id: vinay.fisrekar@stripped\
#   9dremp9hs1nr603a
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZsbeFkAAdbfgEGwXPf/93/v
/yC//9/6UASOjlevTr3XMvdXtvd2hoQmQTJPRT20SempPUY1Nkw0o20iaA9QaeSAMkINTZBMEjTJ
po00AAA0AAAAZCaEaNJok9T1PIm1HqNogNBpobSAADQDFAhJ6aT0yT1NDaQDTQAAGhoBoaAEpNRq
bTRNNJ6h6mNNTQ0aAyAA0AAA0MwmUlOSM1EPtxFD3pN5PorYMccsqwPbEQL9WOvLsTCjoEfYpAOG
TBzQ8LF7umSROTzJndBBBXVLmsYsCYp20KDoU4Kt10H3UXWMSfZ4Y7rks4U/WThg+/7yrSCZ0SdC
4uKvKGFnTC5oibCoKU3JlVXXnwd4QwXWQr1W22y44sgDl/4BWbn3hl8WYC4ghG4Cx+ptmwVAtkiN
KQiEBQghOaKq3hvPW4iCWwxEMjDlkFCFAcSApAWQQmaoOW4RMYkB/JBplJxUpMqB9+p2XnG6pLoE
RZk2d1w4mCvSgKkBRoWfQfZ7lkRdxqXydyMMGJItUzIcrZXDCWsVec1+RrziE3J5XxFK8UGFvWaO
0qOFNUE2oAbuHXoADCOfMoYXqUMLBCKSka6VChHgEmIrTnvgBxANIJXq8akt4Utt5J65zc46mwEQ
4fLMYQiEim+L6oMBJ5ODMPBYy5cgpaba4rgvlAjFx/oc/fpIFhngnjiGgLzKg64gZXKZTzCWig1S
D31EovahuI4+QGWnRZYhh2EoGy9ycBK65b68F0J01pmfNpgevQb5kOLIO2YS3oKI6VbDO+RILgwg
QjEBsDgIGnAU1oe+Kl4UdOjAysvWRdsmpCLvM0F014CDnhtH2i0mf1dVoK0fd4JJ9bK2Q2XSgQOk
CmRrm/RPpkbMEA0j3JtA0S5R8ikmCblJeDCKKQzxvcSbUsccFK/KQSWg2ru1ljx9MqmmlEIFDEsA
f9hYtJcolioLLgFSgTRRGTG1Bz2PJbYVsQcCje1tEjfPVfcHg7VAaR1aNJ+y7dth29hEL8YYcywM
4G7mA+M6TwUxeJXiEQANyfJCxFpm2a3zgvQGCWXfaIQcPmcHSQDcfhVKDFy1bvxYiqIGBSISOmdC
DLbUHi1J7FZpHHGL0RWwtbLfFQOYw90MuKvsxAQAHqHu8U0jOy6dtWRFSXAJpKRRla996aM+jM8V
dZZp4zfyQMIMIydRNzViukLIBfa4DF1MKBtB3loUW24aU3hTFclwpSqYTAal9BghNnX1qYBSEOON
tszAB4pqFrHyFPnFYrFRcHDVNxAwLAJWu2txY9CiKgKSQLKZlEkwTiVuxEmSpEdUXUrCsqvA9oSA
xgCLS/X1JCQhJBXEcMUT3MBG2CEL7JAIgbJhPQb0oVLh9hOKz8azYmbBtiKiAxVTkdCVAZKvnSBC
VBjEYkV1w+cEaHltQljMiGuCo0DQIE2J97IZ6gFUkUwVQuveR/AKcRS0QpkuGYtLSTXWdMuIiwvD
dFGkipb1sQBhH8gfWVPcDFMHuwKD13QFNE6MZpMXANMBCAjgUpV2EZGYMW2ByE1WX8dQiApTGlmK
YeEgMmZZYjYUUILUeswQtj6uW4iYx84vDEXAtBsIhSUyCg0AMBsp3AccDkA4bMLlRlMk6zGMUd/B
nh/i7kinChITY28LIA==


--===============1403437070==--