mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-35007 mroonga should modify source files during build

Browse source 
CMake rewriting the tests causes Mroonga to be un-buildable
on build environments where there source directory is read
only.

In the test results, the version wasn't particularly important.

Remove the version dependence of tests.
This commit is contained in:
Daniel Black 2024-09-25 11:06:11 +10:00
commit 3723fd1573
7 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -307,8 +307,6 @@ storage/mroonga/vendor/groonga/src/grnslap
storage/mroonga/vendor/groonga/src/groonga storage/mroonga/vendor/groonga/src/groonga
storage/mroonga/vendor/groonga/src/groonga-benchmark storage/mroonga/vendor/groonga/src/groonga-benchmark
storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset
storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result
storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
zlib/zconf.h zlib/zconf.h
xxx/* xxx/*
yyy/* yyy/*

8
storage/mroonga/CMakeLists.txt
View file

@ -431,14 +431,6 @@ set(MRN_TEST_SUITE_DIR "${CMAKE_SOURCE_DIR}/mysql-test/suite/mroonga")
if(NOT EXISTS "${MRN_TEST_SUITE_DIR}") if(NOT EXISTS "${MRN_TEST_SUITE_DIR}")
set(MRN_TEST_SUITE_DIR "${PROJECT_SOURCE_DIR}/mysql-test/mroonga") set(MRN_TEST_SUITE_DIR "${PROJECT_SOURCE_DIR}/mysql-test/mroonga")
endif() endif()
configure_file(
"${MRN_TEST_SUITE_DIR}/storage/r/information_schema_plugins.result.in"
"${MRN_TEST_SUITE_DIR}/storage/r/information_schema_plugins.result"
NEWLINE_STYLE LF)
configure_file(
"${MRN_TEST_SUITE_DIR}/storage/r/variable_version.result.in"
"${MRN_TEST_SUITE_DIR}/storage/r/variable_version.result"
NEWLINE_STYLE LF)
configure_file( configure_file(
"${PROJECT_SOURCE_DIR}/data/install.sql.in" "${PROJECT_SOURCE_DIR}/data/install.sql.in"

4
storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result Normal file
View file

@ -0,0 +1,4 @@
select PLUGIN_NAME, PLUGIN_TYPE
from information_schema.plugins where plugin_name = "Mroonga";
PLUGIN_NAME PLUGIN_TYPE
Mroonga STORAGE ENGINE

4
storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result.in
View file

@ -1,4 +0,0 @@
select PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE
from information_schema.plugins where plugin_name = "Mroonga";
PLUGIN_NAME PLUGIN_VERSION PLUGIN_TYPE
Mroonga @MRN_PLUGIN_VERSION@ STORAGE ENGINE

2
storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result.in → storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
View file

@ -1,3 +1,3 @@
show variables like 'mroonga_version'; show variables like 'mroonga_version';
Variable_name Value Variable_name Value
mroonga_version @MRN_VERSION@ mroonga_version #

2
storage/mroonga/mysql-test/mroonga/storage/t/information_schema_plugins.test
View file

@ -16,7 +16,7 @@
--source ../../include/mroonga/have_mroonga.inc --source ../../include/mroonga/have_mroonga.inc
select PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE select PLUGIN_NAME, PLUGIN_TYPE
from information_schema.plugins where plugin_name = "Mroonga"; from information_schema.plugins where plugin_name = "Mroonga";
--source ../../include/mroonga/have_mroonga_deinit.inc --source ../../include/mroonga/have_mroonga_deinit.inc

1
storage/mroonga/mysql-test/mroonga/storage/t/variable_version.test
View file

@ -17,6 +17,7 @@
--source ../../include/mroonga/have_mroonga.inc --source ../../include/mroonga/have_mroonga.inc
# show variables like 'groonga%'; # show variables like 'groonga%';
--replace_column 2 #
show variables like 'mroonga_version'; show variables like 'mroonga_version';
--source ../../include/mroonga/have_mroonga_deinit.inc --source ../../include/mroonga/have_mroonga_deinit.inc