[#3785] Fix config report and increase two timeouts

diff --git a/config-report.sh.in b/config-report.sh.in
index e6c24cf40fa9c6f7625d29e208f99748da385d49..56d146f217a7f0a4408fb772eb482527206474c8 100755 (executable)
--- a/config-report.sh.in
+++ b/config-report.sh.in
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 add_to_report() {
-    printf '%s' "${1}" >> '@TOP_BUILD_DIR@/config.report'
+    cat >> '@TOP_BUILD_DIR@/config.report'
 }
 
 printf '' > '@TOP_BUILD_DIR@/config.report'
 
-add_to_report '
+add_to_report <<HERE_DOCUMENT
        Kea source configure results:
     -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
@@ -24,10 +24,10 @@ Package:
 Meson Version:     @MESON_VERSION@
 Meson info:        @MESON_INFO@
 Build Options:     @BUILD_OPTIONS@
-'
-# Break after build options which can embed strange things..
 
-add_to_report '
+HERE_DOCUMENT
+
+add_to_report <<HERE_DOCUMENT
 C++ Compiler:
   CXX:             @CXX@
   CXX_ID:          @CXX_ID@
@@ -36,8 +36,10 @@ C++ Compiler:
   CXX_ARGS:        @CXX_ARGS@
   LD_ID:           @LD_ID@
   LD_ARGS:         @LD_ARGS@
-'
-add_to_report '
+
+HERE_DOCUMENT
+
+add_to_report <<HERE_DOCUMENT
 Python:
   PYTHON:          @PYTHON_PATH@
   PYTHON_VERSION:  @PYTHON_VERSION@
@@ -51,30 +53,40 @@ Log4cplus:         @LOG4CPLUS_VERSION@
 
 Flex:              @FLEX@
 Bison:             @BISON@
-'
+
+HERE_DOCUMENT
 
 if test '@HAVE_MYSQL@' != 'no'; then
-add_to_report '
+add_to_report <<HERE_DOCUMENT
 MySQL:             @MYSQL_VERSION@
-'
+
+HERE_DOCUMENT
+
 else
-add_to_report '
+
+add_to_report <<HERE_DOCUMENT
 MySQL:             no
-'
+
+HERE_DOCUMENT
 fi
 
 if test '@HAVE_PGSQL@' != 'no'; then
-add_to_report '
+
+add_to_report <<HERE_DOCUMENT
 PostgreSQL:        @PGSQL_VERSION@
-'
+
+HERE_DOCUMENT
+
 else
-add_to_report '
+
+add_to_report <<HERE_DOCUMENT
 PostgreSQL:        no
-'
+
+HERE_DOCUMENT
 fi
 
 if test '@HAVE_NETCONF@' != 'no'; then
-add_to_report '
+add_to_report <<HERE_DOCUMENT
 Netconf:
   LIBYANG:         @LIBYANG_VERSION@
   LIBYANGCPP:      @LIBYANGCPP_VERSION@
@@ -82,39 +94,45 @@ Netconf:
   SYSREPO:         @SYSREPO_VERSION@
   SYSREPOCPP:      @SYSREPOCPP_VERSION@
   SYSREPO_PREFIX:  @SYSREPO_PREFIX@
-'
+
+HERE_DOCUMENT
 else
-add_to_report '
+add_to_report <<HERE_DOCUMENT
 Netconf:           no
-'
+
+HERE_DOCUMENT
 fi
 
 if test '@HAVE_GTEST@' != 'no'; then
-add_to_report '
+add_to_report <<HERE_DOCUMENT
 Google Test:       @GTEST_VERSION@
-'
+
+HERE_DOCUMENT
 else
-add_to_report '
+add_to_report <<HERE_DOCUMENT
 Google Test:       no
-'
+
+HERE_DOCUMENT
 fi
 
 if test '@HAVE_KRB5@' != 'no'; then
-add_to_report '
+add_to_report <<HERE_DOCUMENT
 Kerberos5 GSS-API:
   VERSION:         @KRB5_GSSAPI_VERSION@
   VENDOR:          @KRB5_GSSAPI_VENDOR@
-'
+
+HERE_DOCUMENT
 else
-add_to_report '
+add_to_report <<HERE_DOCUMENT
 Kerberos5 GSS-API: no
-'
+
+HERE_DOCUMENT
 fi
 
-add_to_report '
+add_to_report <<HERE_DOCUMENT
 Developer:
   Tests:           @TESTS_ENABLED@
   Fuzzing:         @FUZZ_ENABLED@
   Valgrind:        @VALGRIND@
   AFL:             @HAVE_AFL@
-'
+HERE_DOCUMENT

diff --git a/src/bin/admin/tests/meson.build b/src/bin/admin/tests/meson.build
index ecb0e776379ec54b5db7c9de5fb913487188f3f7..75c780292c9921e261e1d51f1acae36456a5d77f 100644 (file)
--- a/src/bin/admin/tests/meson.build
+++ b/src/bin/admin/tests/meson.build
@@ -42,7 +42,7 @@ if MYSQL_DEP.found()
         is_parallel: false,
         priority: -1,
         suite: 'shell-tests',
-        timeout: 240,
+        timeout: 480,
     )
 endif
 pgsql_tests = configure_file(
@@ -57,7 +57,7 @@ if POSTGRESQL_DEP.found()
         is_parallel: false,
         priority: -1,
         suite: 'shell-tests',
-        timeout: 240,
+        timeout: 480,
     )
 endif
 # To create the output_dir

diff --git a/src/bin/dhcp6/tests/make-rebuild.sh.in b/src/bin/dhcp6/tests/make-rebuild.sh.in
index 47b6328fad646ff5105a0900072c6334857737d3..c1afda0dbacf29a54ef43cc591aedb46d5543883 100755 (executable)
--- a/src/bin/dhcp6/tests/make-rebuild.sh.in
+++ b/src/bin/dhcp6/tests/make-rebuild.sh.in
@@ -33,6 +33,6 @@ echo "Please copy content of u file into UNPARSED_CONFIGS in get_config_unittest
 printf "Press ENTER when ready"
 read -r _
 mv get_config_unittest_rebuild.cc get_config_unittest.cc
-cp -f get_config_unittest.cc "@source@"_
+cp -f get_config_unittest.cc "@source@"
 echo "Please recompile the kea-dhcp6-tests"
 echo "When done with success you can check it (test suite is Dhcp6GetConfigTest)"