From: Bjorn Munch Date: March 1 2011 2:28pm Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3037) List-Archive: http://lists.mysql.com/commits/132208 Message-Id: <201103011428.p21ES4k3026615@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0644362387==" --===============0644362387== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped 3037 Bjorn Munch 2011-03-01 Try building regex unit tests so they work also in PB modified: regex/CMakeLists.txt === modified file 'regex/CMakeLists.txt' --- a/regex/CMakeLists.txt 2010-10-05 06:33:15 +0000 +++ b/regex/CMakeLists.txt 2011-03-01 14:27:55 +0000 @@ -21,6 +21,9 @@ ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SO ADD_EXECUTABLE(re main.c split.c debug.c) TARGET_LINK_LIBRARIES(re regex strings mysys) -ADD_TEST(regex1 re -i${CMAKE_CURRENT_SOURCE_DIR}/tests) -ADD_TEST(regex2 re -el -i${CMAKE_CURRENT_SOURCE_DIR}/tests) -ADD_TEST(regex3 re -er -i${CMAKE_CURRENT_SOURCE_DIR}/tests) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/tests + ${CMAKE_CURRENT_BINARY_DIR}/re_tests COPYONLY) + +ADD_TEST(regex1 re -i${CMAKE_CURRENT_BINARY_DIR}/re_tests) +ADD_TEST(regex2 re -el -i${CMAKE_CURRENT_BINARY_DIR}/re_tests) +ADD_TEST(regex3 re -er -i${CMAKE_CURRENT_BINARY_DIR}/re_tests) --===============0644362387== 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/mtr-tr/ # testament_sha1: 11f8a1d93c0f7de19ad34e9f127b4cfe1c3f1f27 # timestamp: 2011-03-01 15:28:04 +0100 # source_branch: file:///home/bm136801/my/main-tr/ # base_revision_id: bjorn.munch@stripped\ # y2bttfdqsfpuz0ew # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZB2b20AAX1fgCAYVGP/93+v 3iC////6UAPd29eBtIpFiCSk0AEZNU8NJ5Ke00E0Q/Uj0mnqNPU0bKD1BJRGpsTTTUzUm0CTRoAD QANAABFNqaBGamR6gaNNGjQYgADamQGgIKn6ppk0yGT0TCAANNNDQDTQ0AAkimmU9RlPSep5TE1P amppp6ZQYhoGjRoHoQ0wZcCUWEMTECqgESiRiKAJM0G0sI7DVnBNKztdIi6cg7lYIYqYpoOsE1Bh FFozZGT15igy4IL0U3F1fVVbtmSEiQaci1X1+a5YlvwHqIpuNQpyNbWe2HS/oq0TLK9pSHYhGVZH xU+QaGpRrZtZg7iMED0Mgqr/bD3lJl2KS1tIYXf8o5UVXPl8CDcZtTwgdUQ69BA/Zhyc14yCYxfq MsjNrXHVztIP16NMM+pC2OWWw1C0HXmhg0OSp6OA84vZi3BBJ5Xa+GzS7ZTA1EzNhnZu2ihjVUYl QZpk+L/4TuCYM1mqGwT8I0gKFKzpYNw3qdonWQCwHnNOkB+ksSNscC4iNnnddPFeXVTXlbvMhxAq Xl3LlSryAtitupRNOybhfsdDNc15zDLGjJsI0JPhpbMwNr0+V1RjZYWl5e4Ybb+gVt71WFgYwtky 3c1SdNFoGIIyaV/WbL8bZuJZ+zdDaImvyjvB5gxvC/nX06owQYoUckxHouksSPmuiP02eHpzNwSI lQ6/JEKuAf4uRDtbfGnwsQwsgTRZjWJOqkcc/CpF2esLwyIygw9q067kffVQUA4ML3iY9nX7ew7f mkROF7kZCSvht3HHVRQ/PgRArvceQ8Xr34WL1FxuV58Bjn8ZwVPgpm8PHyMJRzzAqvoY3GJFx90i eHLyt+tNsZI845Mnkz7NUWsfGzaTzgTo30uTyF1yZXLZCM7O7ZS7tY5rliCsNwsZwm7mv5NsSi1p 1jI0cuaE25t7lphM70yiKLuqzQWY846KIKFmQ1Ysr+ekZPO/XY2JWEAYDGdtvbLK4bMa2jjtgpUR ottQoQYQYZVWnCCokre4rI1tBioJbb1A4jlCuX848sLQqD47C3VTR5HRnEaQLtBz26VyBm9ZhqRY Fj6WUDIkMOTvpePQkSOBQzTLo2FNK3CIyaLiGkNU3mqmwiQQfgoMKJIpg6ZcLj4xRswAngpheNHV IYFsa5pG91TMaKjAqKWMTSFz5OitfEadpZ1xjYmJLjNeYHNj0p6JcHEeUpJKNlHW+picIrbxvyTD GO8GPJM4csfPVmBeDBRTc2+ldNjGmtkoTvYmErU1+XPJRC8OOTbEDmqe5dCqNrw4SCN8/hNWqNZh WyrYdgQMXeKSdqO8Xd8StOhUMYZ1fuWIWiwbBObzqjij/i7kinChISDs3to= --===============0644362387==--