mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-04-02 20:32:26 +02:00
f918523551
> Remove the builddir path from the scripts.
The admin scripts still contain builddir, but it no longer causes any
problems.
> kea-hook-mysql-cb -> kea-hook-mysql
> kea-hook-pgsql-cb -> kea-hook-pgsql
libdhcp_mysql_cb.so and libdhcp_pgsql_cb.so has been renamed, they don't
have _cb suffix anymore. In Kea 2, they only implemented database storage
for the configuration backend, but since Kea 3, they also implement lease
and host backends which were originally in the "core".
However, to use them for the configuration backend, they must be loaded
together with libdhcp_cb_cmds.so which is available only for ISC
customers. This is not new, it was also the case in Kea 2, i.e.
kea-hook-{mysql,pgsql}-cb were useless in Kea 2.
173 lines
4.4 KiB
Diff
173 lines
4.4 KiB
Diff
From: Jakub Jirutka <jakub@jirutka.cz>
|
|
Date: Sat, 15 Nov 2025 16:22:02 +0100
|
|
Subject: [PATCH] Disable PostgreSQL and MySQL tests
|
|
|
|
Tests for MySQL/PostgreSQL integration are kinda broken, they expect
|
|
already initialized databases prepared for Kea tests.
|
|
|
|
--- a/src/bin/admin/tests/meson.build
|
|
+++ b/src/bin/admin/tests/meson.build
|
|
@@ -35,7 +35,7 @@
|
|
output: 'mysql_tests.sh',
|
|
configuration: kea_admin_tests_conf_data,
|
|
)
|
|
-if MYSQL_DEP.found()
|
|
+if MYSQL_DEP.found() and false # XXX-Patched
|
|
test(
|
|
'kea_admin_mysql_tests.sh',
|
|
mysql_tests,
|
|
@@ -50,7 +50,7 @@
|
|
output: 'pgsql_tests.sh',
|
|
configuration: kea_admin_tests_conf_data,
|
|
)
|
|
-if POSTGRESQL_DEP.found()
|
|
+if POSTGRESQL_DEP.found() and false # XXX-Patched
|
|
test(
|
|
'kea_admin_pgsql_tests.sh',
|
|
pgsql_tests,
|
|
--- a/src/bin/dhcp4/tests/decline_unittest.cc
|
|
+++ b/src/bin/dhcp4/tests/decline_unittest.cc
|
|
@@ -29,6 +29,10 @@
|
|
#include <boost/shared_ptr.hpp>
|
|
#include <sstream>
|
|
|
|
+// XXX-Patched
|
|
+#undef HAVE_MYSQL
|
|
+#undef HAVE_PGSQL
|
|
+
|
|
using namespace isc;
|
|
using namespace isc::asiolink;
|
|
using namespace isc::data;
|
|
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
|
|
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
|
|
@@ -55,6 +55,10 @@
|
|
#include <arpa/inet.h>
|
|
#include <dirent.h>
|
|
|
|
+// XXX-Patched
|
|
+#undef HAVE_MYSQL
|
|
+#undef HAVE_PGSQL
|
|
+
|
|
using namespace isc;
|
|
using namespace isc::asiolink;
|
|
using namespace isc::cb;
|
|
--- a/src/bin/dhcp4/tests/dora_unittest.cc
|
|
+++ b/src/bin/dhcp4/tests/dora_unittest.cc
|
|
@@ -33,6 +33,10 @@
|
|
#include <set>
|
|
#include <vector>
|
|
|
|
+// XXX-Patched
|
|
+#undef HAVE_MYSQL
|
|
+#undef HAVE_PGSQL
|
|
+
|
|
using namespace isc;
|
|
using namespace isc::asiolink;
|
|
using namespace isc::data;
|
|
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
|
|
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
|
|
@@ -43,6 +43,9 @@
|
|
#include <arpa/inet.h>
|
|
#include <unistd.h>
|
|
|
|
+// XXX-Patched
|
|
+#undef HAVE_MYSQL
|
|
+
|
|
using namespace std;
|
|
using namespace isc;
|
|
using namespace isc::asiolink;
|
|
--- a/src/bin/dhcp6/tests/decline_unittest.cc
|
|
+++ b/src/bin/dhcp6/tests/decline_unittest.cc
|
|
@@ -24,6 +24,10 @@
|
|
|
|
#include <stats/stats_mgr.h>
|
|
|
|
+// XXX-Patched
|
|
+#undef HAVE_MYSQL
|
|
+#undef HAVE_PGSQL
|
|
+
|
|
using namespace isc;
|
|
using namespace isc::asiolink;
|
|
using namespace isc::data;
|
|
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
|
|
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
|
|
@@ -56,6 +56,10 @@
|
|
#include <dirent.h>
|
|
#include <unistd.h>
|
|
|
|
+// XXX-Patched
|
|
+#undef HAVE_MYSQL
|
|
+#undef HAVE_PGSQL
|
|
+
|
|
using namespace isc;
|
|
using namespace isc::asiolink;
|
|
using namespace isc::cb;
|
|
--- a/src/bin/dhcp6/tests/kea_controller_unittest.cc
|
|
+++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc
|
|
@@ -40,6 +40,9 @@
|
|
#include <arpa/inet.h>
|
|
#include <unistd.h>
|
|
|
|
+// XXX-Patched
|
|
+#undef HAVE_MYSQL
|
|
+
|
|
using namespace std;
|
|
using namespace isc;
|
|
using namespace isc::asiolink;
|
|
--- a/src/hooks/dhcp/forensic_log/libloadtests/meson.build
|
|
+++ b/src/hooks/dhcp/forensic_log/libloadtests/meson.build
|
|
@@ -1,4 +1,4 @@
|
|
-if not TESTS_OPT.enabled()
|
|
+if not TESTS_OPT.enabled() or true
|
|
subdir_done()
|
|
endif
|
|
|
|
--- a/src/hooks/dhcp/forensic_log/tests/meson.build
|
|
+++ b/src/hooks/dhcp/forensic_log/tests/meson.build
|
|
@@ -1,4 +1,4 @@
|
|
-if not TESTS_OPT.enabled()
|
|
+if not TESTS_OPT.enabled() or true
|
|
subdir_done()
|
|
endif
|
|
|
|
--- a/src/hooks/dhcp/lease_query/tests/meson.build
|
|
+++ b/src/hooks/dhcp/lease_query/tests/meson.build
|
|
@@ -1,4 +1,4 @@
|
|
-if not TESTS_OPT.enabled()
|
|
+if not TESTS_OPT.enabled() or true # XXX-Patched
|
|
subdir_done()
|
|
endif
|
|
|
|
--- a/src/hooks/dhcp/mysql/tests/meson.build
|
|
+++ b/src/hooks/dhcp/mysql/tests/meson.build
|
|
@@ -1,4 +1,4 @@
|
|
-if not TESTS_OPT.enabled() or not MYSQL_DEP.found()
|
|
+if not TESTS_OPT.enabled() or not MYSQL_DEP.found() or true # XXX-Patched
|
|
subdir_done()
|
|
endif
|
|
|
|
--- a/src/hooks/dhcp/pgsql/tests/meson.build
|
|
+++ b/src/hooks/dhcp/pgsql/tests/meson.build
|
|
@@ -1,4 +1,4 @@
|
|
-if not TESTS_OPT.enabled() or not POSTGRESQL_DEP.found()
|
|
+if not TESTS_OPT.enabled() or not POSTGRESQL_DEP.found() or true # XXX-Patched
|
|
subdir_done()
|
|
endif
|
|
|
|
--- a/src/lib/mysql/tests/meson.build
|
|
+++ b/src/lib/mysql/tests/meson.build
|
|
@@ -1,4 +1,4 @@
|
|
-if not TESTS_OPT.enabled() or not MYSQL_DEP.found()
|
|
+if not TESTS_OPT.enabled() or not MYSQL_DEP.found() or true # XXX-Patched
|
|
subdir_done()
|
|
endif
|
|
|
|
--- a/src/lib/pgsql/tests/meson.build
|
|
+++ b/src/lib/pgsql/tests/meson.build
|
|
@@ -1,4 +1,4 @@
|
|
-if not TESTS_OPT.enabled() or not POSTGRESQL_DEP.found()
|
|
+if not TESTS_OPT.enabled() or not POSTGRESQL_DEP.found() or true # XXX-Patched
|
|
subdir_done()
|
|
endif
|
|
|