Skip to content

mroonga: tests: prevents error if sourcedir is readonly #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 10.0
Choose a base branch
from
Open

mroonga: tests: prevents error if sourcedir is readonly #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ storage/mroonga/vendor/groonga/src/grnslap
storage/mroonga/vendor/groonga/src/groonga
storage/mroonga/vendor/groonga/src/groonga-benchmark
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
# C and C++

# Compiled Object files
Expand Down
8 changes: 0 additions & 8 deletions storage/mroonga/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,14 +423,6 @@ set(MRN_TEST_SUITE_DIR "${CMAKE_SOURCE_DIR}/mysql-test/suite/mroonga")
if(NOT EXISTS "${MRN_TEST_SUITE_DIR}")
set(MRN_TEST_SUITE_DIR "${PROJECT_SOURCE_DIR}/mysql-test/mroonga")
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(
"${PROJECT_SOURCE_DIR}/data/install.sql.in"
Expand Down
4 changes: 4 additions & 0 deletions storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 4 deletions storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result.in
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...onga/storage/r/variable_version.result.in → ...mroonga/storage/r/variable_version.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
show variables like 'mroonga_version';
Variable_name Value
mroonga_version @MRN_VERSION@
mroonga_version X.YY
2 changes: 1 addition & 1 deletion storage/mroonga/mysql-test/mroonga/storage/t/information_schema_plugins.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

--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";

--source ../../include/mroonga/have_mroonga_deinit.inc
1 change: 1 addition & 0 deletions storage/mroonga/mysql-test/mroonga/storage/t/variable_version.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
--source ../../include/mroonga/have_mroonga.inc

# show variables like 'groonga%';
--replace_regex /[0-9]+\.[0-9]+/X.YY/
show variables like 'mroonga_version';

--source ../../include/mroonga/have_mroonga_deinit.inc