diff options
| author | Andrei Pavel <andrei@isc.org> | 2024-02-21 14:08:54 +0100 |
|---|---|---|
| committer | Andrei Pavel <andrei@isc.org> | 2024-02-22 09:06:33 +0100 |
| commit | 8f641638631fd579948662f36e5f949b045fe876 (patch) | |
| tree | 20bdb45e8808dd5facb4034984dc6092f30e449d | |
| parent | [#3025] use admin-utils.sh based on location in upgrade scripts (diff) | |
| download | kea-8f641638631fd579948662f36e5f949b045fe876.tar.xz kea-8f641638631fd579948662f36e5f949b045fe876.zip | |
[#3025] fix distcheck
| -rw-r--r-- | src/lib/database/testutils/Makefile.am | 3 | ||||
| -rw-r--r-- | src/lib/mysql/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | src/lib/mysql/tests/mysql_connection_unittest.cc | 12 | ||||
| -rw-r--r-- | src/lib/pgsql/tests/Makefile.am | 1 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/lib/database/testutils/Makefile.am b/src/lib/database/testutils/Makefile.am index 4faf645570..a64752412f 100644 --- a/src/lib/database/testutils/Makefile.am +++ b/src/lib/database/testutils/Makefile.am @@ -1,7 +1,8 @@ SUBDIRS = . -AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib TEST_CA_DIR = $(realpath $(abs_srcdir)/../../asiolink/testutils/ca) + +AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += -DTEST_CA_DIR=\"$(TEST_CA_DIR)\" AM_CXXFLAGS = $(KEA_CXXFLAGS) diff --git a/src/lib/mysql/tests/Makefile.am b/src/lib/mysql/tests/Makefile.am index e560be9c7c..2c0053c4c8 100644 --- a/src/lib/mysql/tests/Makefile.am +++ b/src/lib/mysql/tests/Makefile.am @@ -1,7 +1,9 @@ SUBDIRS = . +TEST_CA_DIR = $(realpath $(abs_srcdir)/../../asiolink/testutils/ca) + AM_CPPFLAGS = -AM_CPPFLAGS += -DABS_SRCDIR="\"$(abs_top_builddir)\"" +AM_CPPFLAGS += -DTEST_CA_DIR=\"$(TEST_CA_DIR)\" AM_CPPFLAGS += -DKEA_ADMIN=\"${abs_top_builddir}/src/bin/admin/kea-admin\" AM_CPPFLAGS += -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS) diff --git a/src/lib/mysql/tests/mysql_connection_unittest.cc b/src/lib/mysql/tests/mysql_connection_unittest.cc index 51376f971a..0adc6b619e 100644 --- a/src/lib/mysql/tests/mysql_connection_unittest.cc +++ b/src/lib/mysql/tests/mysql_connection_unittest.cc @@ -1000,16 +1000,12 @@ TEST_F(MySqlConnectionTest, toKeaAdminParameters) { parameters = DatabaseConnection::parse(full_mysql_connection_string); kea_admin_parameters = MySqlConnection::toKeaAdminParameters(parameters); EXPECT_EQ(kea_admin_parameters, - vector<string>({"mysql", "--extra", - "--ssl-cert " ABS_SRCDIR "/src/lib/asiolink/testutils/ca/" - "kea-client.crt", + vector<string>({"mysql", "--extra", "--ssl-cert " TEST_CA_DIR "/kea-client.crt", "--extra", "--ssl-cipher AES", "--extra", "--connect_timeout 10", "--host", "127.0.0.1", "--extra", - "--ssl-key " ABS_SRCDIR "/src/lib/asiolink/testutils/ca/" - "kea-client.key", - "--name", "keatest", "--password", "keatest", "--extra", - "--ssl-ca " ABS_SRCDIR "/src/lib/asiolink/testutils/ca/kea-ca.crt", - "--user", "keatest_secure"})); + "--ssl-key " TEST_CA_DIR "/kea-client.key", "--name", "keatest", + "--password", "keatest", "--extra", + "--ssl-ca " TEST_CA_DIR "/kea-ca.crt", "--user", "keatest_secure"})); } } // namespace diff --git a/src/lib/pgsql/tests/Makefile.am b/src/lib/pgsql/tests/Makefile.am index ac4cfc77c9..be8b932e4e 100644 --- a/src/lib/pgsql/tests/Makefile.am +++ b/src/lib/pgsql/tests/Makefile.am @@ -1,7 +1,6 @@ SUBDIRS = . AM_CPPFLAGS = -AM_CPPFLAGS += -DABS_TOP_BUILDDIR="\"$(abs_top_builddir)\"" AM_CPPFLAGS += -DKEA_ADMIN=\"${abs_top_builddir}/src/bin/admin/kea-admin\" AM_CPPFLAGS += -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS) |