From: Razvan Becheriu Date: Wed, 8 Jul 2026 19:39:56 +0000 (+0300) Subject: [#4630] generate versions automatically X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=def011622df196bd152e6a2c82cdebf221d738b0;p=thirdparty%2Fkea.git [#4630] generate versions automatically --- diff --git a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in index 943cbb6e03..dc0c2f47b0 100755 --- a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in +++ b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in @@ -698,8 +698,10 @@ dynamic_reconfiguration_test shutdown_test "dhcpv4.sigterm_test" 15 shutdown_test "dhcpv4.sigint_test" 2 version_test "dhcpv4.version" -EXPECTED_OUTPUT=$(cat << 'EOF' -Kea DHCPv4 server, version 3.3.0-git (development) +VERSION=@VERSION@ +PACKAGE_VERSION_TYPE=@PACKAGE_VERSION_TYPE@ +EXPECTED_OUTPUT=$(cat << EOF +Kea DHCPv4 server, version $VERSION ($PACKAGE_VERSION_TYPE) Usage: kea-dhcp4 -[v|V|W|X] [-d] [-{c|t|T} cfgfile] [-p number] [-P number] -v: print version number and exit diff --git a/src/bin/dhcp4/tests/meson.build b/src/bin/dhcp4/tests/meson.build index 7cc8121fcd..3dc9d75f78 100644 --- a/src/bin/dhcp4/tests/meson.build +++ b/src/bin/dhcp4/tests/meson.build @@ -34,6 +34,8 @@ dhcp4_tests_conf_data = configuration_data() dhcp4_tests_conf_data.set('abs_top_builddir', TOP_BUILD_DIR) dhcp4_tests_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR) dhcp4_tests_conf_data.set('abs_builddir', current_build_dir) +dhcp4_tests_conf_data.set('VERSION', f'"@PROJECT_VERSION@"') +dhcp4_tests_conf_data.set('PACKAGE_VERSION_TYPE', f'"@package_version_type@"') dhcp4_process_tests = configure_file( input: 'dhcp4_process_tests.sh.in', output: 'dhcp4_process_tests.sh', diff --git a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in index d8524a8070..102c016e55 100755 --- a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in +++ b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in @@ -723,8 +723,10 @@ dynamic_reconfiguration_test shutdown_test "dhcpv6.sigterm_test" 15 shutdown_test "dhcpv6.sigint_test" 2 version_test "dhcpv6.version" -EXPECTED_OUTPUT=$(cat << 'EOF' -Kea DHCPv6 server, version 3.3.0-git (development) +VERSION=@VERSION@ +PACKAGE_VERSION_TYPE=@PACKAGE_VERSION_TYPE@ +EXPECTED_OUTPUT=$(cat << EOF +Kea DHCPv6 server, version $VERSION ($PACKAGE_VERSION_TYPE) Usage: kea-dhcp6 -[v|V|W|X] [-d] [-{c|t|T} cfgfile] [-p number] [-P number] -v: print version number and exit diff --git a/src/bin/dhcp6/tests/meson.build b/src/bin/dhcp6/tests/meson.build index fb84a2fe63..d8c30b033b 100644 --- a/src/bin/dhcp6/tests/meson.build +++ b/src/bin/dhcp6/tests/meson.build @@ -34,6 +34,8 @@ dhcp6_tests_conf_data = configuration_data() dhcp6_tests_conf_data.set('abs_top_builddir', TOP_BUILD_DIR) dhcp6_tests_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR) dhcp6_tests_conf_data.set('abs_builddir', current_build_dir) +dhcp6_tests_conf_data.set('VERSION', f'"@PROJECT_VERSION@"') +dhcp6_tests_conf_data.set('PACKAGE_VERSION_TYPE', f'"@package_version_type@"') dhcp6_process_tests = configure_file( input: 'dhcp6_process_tests.sh.in', output: 'dhcp6_process_tests.sh',