1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#14737559 BZR JOIN PLUGIN TREES INTO INTERNAL/PLUGIN

Browse Source 
Part three:
Fix some search paths.
This commit is contained in:
Tor Didriksen 2012-10-24 17:06:43 +02:00
parent 9934bc5409
commit 4baab59e93
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/install_layout.cmake
View File

@ -104,7 +104,10 @@ ENDIF()
# just use if(INSTALL_PLUGINTESTDIR). # just use if(INSTALL_PLUGINTESTDIR).
# The plugin must set its own install path for tests # The plugin must set its own install path for tests
# #
FILE(GLOB plugin_tests ${CMAKE_SOURCE_DIR}/plugin/*/tests) FILE(GLOB plugin_tests
${CMAKE_SOURCE_DIR}/plugin/*/tests
${CMAKE_SOURCE_DIR}/internal/plugin/*/tests
)
# #
# STANDALONE layout # STANDALONE layout

1
cmake/plugin.cmake
View File

@ -39,6 +39,7 @@ MACRO(PLUGIN_APPEND_COLLECTIONS plugin)
GET_FILENAME_COMPONENT(fname ${cfile} NAME) GET_FILENAME_COMPONENT(fname ${cfile} NAME)
FILE(APPEND ${CMAKE_SOURCE_DIR}/mysql-test/collections/${fname} "${contents}") FILE(APPEND ${CMAKE_SOURCE_DIR}/mysql-test/collections/${fname} "${contents}")
FILE(APPEND ${fcopied} "${fname}\n") FILE(APPEND ${fcopied} "${fname}\n")
MESSAGE(STATUS "Appended ${cfile}")
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()
ENDMACRO() ENDMACRO()

1
mysql-test/lib/mtr_cases.pm
View File

@ -295,6 +295,7 @@ sub collect_one_suite($)
"storage/*/mtr", "storage/*/mtr",
# Look in plugin specific suite dir # Look in plugin specific suite dir
"plugin/$suite/tests", "plugin/$suite/tests",
"internal/plugin/$suite/tests",
], ],
[$suite, "mtr"], ($suite =~ /^i_/)); [$suite, "mtr"], ($suite =~ /^i_/));
return unless $suitedir; return unless $suitedir;

1
mysql-test/mysql-test-run.pl
View File

@ -459,6 +459,7 @@ sub main {
# Also read from any plugin local or suite specific plugin.defs # Also read from any plugin local or suite specific plugin.defs
for (glob "$basedir/plugin/*/tests/mtr/plugin.defs". for (glob "$basedir/plugin/*/tests/mtr/plugin.defs".
" $basedir/internal/plugin/*/tests/mtr/plugin.defs".
" suite/*/plugin.defs") { " suite/*/plugin.defs") {
read_plugin_defs($_); read_plugin_defs($_);
} }