Skip to content

MDEV-40936 Install test binaries to libexecdir instead of bindir #5608

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
dhandzus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MDEV-40936 Install test binaries to libexecdir instead of bindir #5608

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: 1 addition & 1 deletion client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ IF(UNIX)
SET_TARGET_PROPERTIES(mariadb PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)

MYSQL_ADD_EXECUTABLE(mariadb-test mysqltest.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc COMPONENT Test)
MYSQL_ADD_EXECUTABLE(mariadb-test mysqltest.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc COMPONENT Test DESTINATION ${INSTALL_LIBEXECDIR})
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS ${PCRE2_DEBIAN_HACK}")
TARGET_LINK_LIBRARIES(mariadb-test ${CLIENT_LIB} pcre2-posix pcre2-8)
SET_TARGET_PROPERTIES(mariadb-test PROPERTIES ENABLE_EXPORTS TRUE)
Expand Down
5 changes: 5 additions & 0 deletions cmake/install_layout.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
# - INSTALL_SYSCONF2DIR (additional config files, e.g. /etc/mysql/conf.d)
#
# - INSTALL_LIBDIR (directory with client end embedded libraries)
# - INSTALL_LIBEXECDIR (directory with binaries that are not executed directly)
# - INSTALL_PLUGINDIR (directory for plugins)
#
# - INSTALL_INCLUDEDIR (directory for MySQL headers)
Expand Down Expand Up @@ -108,6 +109,7 @@ SET(INSTALL_SBINDIR_STANDALONE "bin")
SET(INSTALL_SCRIPTDIR_STANDALONE "scripts")
#
SET(INSTALL_LIBDIR_STANDALONE "lib")
SET(INSTALL_LIBEXECDIR_STANDALONE "libexec")
SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin")
#
SET(INSTALL_INCLUDEDIR_STANDALONE "include/mysql")
Expand Down Expand Up @@ -142,6 +144,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
ELSE()
SET(INSTALL_LIBDIR_RPM "lib")
ENDIF()
SET(INSTALL_LIBEXECDIR_RPM "libexec")
SET(INSTALL_PLUGINDIR_RPM "${INSTALL_LIBDIR_RPM}/mysql/plugin")
#
SET(INSTALL_INCLUDEDIR_RPM "include/mysql")
Expand Down Expand Up @@ -182,6 +185,7 @@ SET(INSTALL_SYSCONFDIR_DEB "/etc")
SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/mariadb.conf.d")
#
SET(INSTALL_LIBDIR_DEB "lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}")
SET(INSTALL_LIBEXECDIR_DEB "libexec")
SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin")
#
SET(INSTALL_INCLUDEDIR_DEB "include/mariadb")
Expand Down Expand Up @@ -215,6 +219,7 @@ SET(INSTALL_SBINDIR_SVR4 "bin")
SET(INSTALL_SCRIPTDIR_SVR4 "scripts")
#
SET(INSTALL_LIBDIR_SVR4 "lib")
SET(INSTALL_LIBEXECDIR_SVR4 "libexec")
SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin")
#
SET(INSTALL_INCLUDEDIR_SVR4 "include/mysql")
Expand Down
18 changes: 9 additions & 9 deletions debian/mariadb-test.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
usr/bin/mariadb-client-test
usr/bin/mariadb-client-test-embedded
usr/bin/mariadb-test
usr/bin/mariadb-test-embedded
usr/bin/mysql_client_test
usr/bin/mysql_client_test_embedded
usr/bin/mysqltest
usr/bin/mysqltest_embedded
usr/bin/test-connect-t
usr/libexec/mariadb-client-test
usr/libexec/mariadb-client-test-embedded
usr/libexec/mariadb-test
usr/libexec/mariadb-test-embedded
usr/libexec/mysql_client_test
usr/libexec/mysql_client_test_embedded
usr/libexec/mysqltest
usr/libexec/mysqltest_embedded
usr/libexec/test-connect-t
usr/lib/*/libmariadb3/plugin/auth_test_plugin.so
usr/lib/*/libmariadb3/plugin/qa_auth_client.so
usr/lib/*/libmariadb3/plugin/qa_auth_interface.so
Expand Down
4 changes: 2 additions & 2 deletions libmysqld/examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ IF(UNIX)
ENDIF(UNIX)

MYSQL_ADD_EXECUTABLE(mariadb-test-embedded ../../client/mysqltest.cc
COMPONENT Test)
COMPONENT Test DESTINATION ${INSTALL_LIBEXECDIR})
TARGET_LINK_LIBRARIES(mariadb-test-embedded mysqlserver pcre2-posix pcre2-8)
SET_SOURCE_FILES_PROPERTIES(../../client/mysqltest.cc PROPERTIES COMPILE_FLAGS "${PCRE2_DEBIAN_HACK}")

Expand All @@ -51,7 +51,7 @@ IF(CMAKE_GENERATOR MATCHES "Xcode")
../../tests/mysql_client_test.c)
ELSE()
MYSQL_ADD_EXECUTABLE(mariadb-client-test-embedded ../../tests/mysql_client_test.c
COMPONENT Test)
COMPONENT Test DESTINATION ${INSTALL_LIBEXECDIR})
SET_TARGET_PROPERTIES(mariadb-client-test-embedded PROPERTIES HAS_CXX TRUE)
ENDIF()
TARGET_LINK_LIBRARIES(mariadb-client-test-embedded mysqlserver)
Expand Down
14 changes: 10 additions & 4 deletions mysql-test/mariadb-test-run.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1952,7 +1952,8 @@ ()
{
$exe_mysqltest=
mtr_exe_exists("$bindir/libmysqld/examples$multiconfig/mariadb-test-embedded",
"$path_client_bindir/mariadb-test-embedded");
"$path_client_bindir/mariadb-test-embedded",
"$bindir/libexec/mariadb-test-embedded");
}
else
{
Expand All @@ -1965,7 +1966,8 @@ ()
}
else
{
$exe_mysqltest= mtr_exe_exists("$path_client_bindir/mariadb-test");
$exe_mysqltest= mtr_exe_exists("$path_client_bindir/mariadb-test",
"$bindir/libexec/mariadb-test");
}
}

Expand Down Expand Up @@ -2057,13 +2059,17 @@ ()
$exe= mtr_exe_maybe_exists(
"$bindir/libmysqld/examples$multiconfig/mariadb-client-test-embedded",
"$bindir/bin/mariadb-client-test-embedded",
"$bindir/libexec/mariadb-client-test-embedded",
"$bindir/libmysqld/examples$multiconfig/mysql_client_test_embedded",
"$bindir/bin/mysql_client_test_embedded");
"$bindir/bin/mysql_client_test_embedded",
"$bindir/libexec/mysql_client_test_embedded");
} else {
$exe= mtr_exe_maybe_exists("$bindir/tests$multiconfig/mariadb-client-test",
"$bindir/bin/mariadb-client-test",
"$bindir/libexec/mariadb-client-test",
"$bindir/tests$multiconfig/mysql_client_test",
"$bindir/bin/mysql_client_test");
"$bindir/bin/mysql_client_test",
"$bindir/libexec/mysql_client_test");
}

my $args;
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(BEFORE
${CMAKE_BINARY_DIR}/libmariadb/include
${CMAKE_SOURCE_DIR}/libmariadb/include)

MYSQL_ADD_EXECUTABLE(mariadb-client-test mysql_client_test.c COMPONENT Test)
MYSQL_ADD_EXECUTABLE(mariadb-client-test mysql_client_test.c COMPONENT Test DESTINATION ${INSTALL_LIBEXECDIR})
SET(CLIENT_LIB mariadbclient mysys)

TARGET_LINK_LIBRARIES(mariadb-client-test ${CLIENT_LIB})
Expand Down
2 changes: 1 addition & 1 deletion unittest/embedded/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ADD_DEFINITIONS(-DEMBEDDED_LIBRARY -UMYSQL_CLIENT)


MYSQL_ADD_EXECUTABLE(test-connect-t test-connect.cc
COMPONENT Test)
COMPONENT Test DESTINATION ${INSTALL_LIBEXECDIR})
TARGET_LINK_LIBRARIES(test-connect-t mysqlserver )
MY_ADD_TEST(test-connect)

Expand Down