[#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 943cbb6e03304fa08e1a7917c20f27a20e4e2c00..dc0c2f47b0065ae42b8e31e739e7282e1df6ce4b 100755 (executable)
--- 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 7cc8121fcda1434ea50a60ac365e50034a3d688d..3dc9d75f78d4d5addaa42ddb5c64705f1c159e2b 100644 (file)
--- 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 d8524a8070925249d06ddb455b3d435b4339cc59..102c016e5528aa3b83a6ff27dacd0f2a4d016d28 100755 (executable)
--- 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 fb84a2fe635ea27ef2707b48f3dc47dea36d2ba8..d8c30b033b6736180fcd72771f5db4668893526d 100644 (file)
--- 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',