commit 86840eca40f0e0cc564a426b6158152480fd27d8
author Jan Kundrát <jan.kundrat@cesnet.cz> Wed Jan 27 15:38:08 2021 +0100
committer Jan Kundrát <jan.kundrat@cesnet.cz> Wed Jan 27 17:21:06 2021 +0100
tree 635ccc520cf53f240b73058d3549a706502ad0fb
parent 6c34e9f140d761ad68565f70c8f1f2a6af94f010

Update the NETCONF stack

This new sysrepo doesn't have the --wait option for sysrepocfg anymore;
in the patch it looks like it's by design.

While we're at this, also make sure that the UBSAN reports are useful.

Change-Id: I7e2ae4a57ae2ff3ad719ba6ae600a9d0235e925e
Depends-on: https://cesnet-gerrit-czechlight/CzechLight/dependencies/+/3510
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/dependencies/+/3510
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/cla-sysrepo/+/3530

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c92674..533a77d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,14 +77,14 @@
     message(FATAL_ERROR "Cannot combine ENABLE_FULL_TESTS=ON with BUILD_TESTING=OFF")
 endif()
 
-pkg_check_modules(LIBYANG REQUIRED libyang-cpp>=1.0.209 IMPORTED_TARGET libyang)
+pkg_check_modules(LIBYANG REQUIRED libyang-cpp>=1.0.215 IMPORTED_TARGET libyang)
 pkg_check_modules(LIBNETCONF2 REQUIRED libnetconf2>=1.1.36 IMPORTED_TARGET libnetconf2)
 
 if(ENABLE_FULL_TESTS STREQUAL OFF AND ENABLE_SYSREPO_CLI STREQUAL OFF)
     message(STATUS "Skipping sysrepo per configure options")
     set(SYSREPO_FOUND 0)
 else()
-    pkg_check_modules(SYSREPO sysrepo-cpp>=1.4.100 IMPORTED_TARGET sysrepo)
+    pkg_check_modules(SYSREPO sysrepo-cpp>=1.4.103 IMPORTED_TARGET sysrepo)
 endif()
 
 if(SYSREPO_FOUND)

ci/build.sh

diff --git a/ci/build.sh b/ci/build.sh
index 3dacb5f..1cd27d7 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -28,6 +28,7 @@
     export CFLAGS="-fsanitize=undefined ${CFLAGS}"
     export CXXFLAGS="-fsanitize=undefined ${CXXFLAGS}"
     export LDFLAGS="-fsanitize=undefined ${LDFLAGS}"
+    export UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1
 fi
 
 if [[ $ZUUL_JOB_NAME =~ .*-asan ]]; then
@@ -40,7 +41,7 @@
     export CFLAGS="-fsanitize=thread ${CFLAGS}"
     export CXXFLAGS="-fsanitize=thread ${CXXFLAGS}"
     export LDFLAGS="-fsanitize=thread ${LDFLAGS}"
-    export TSAN_OPTIONS="suppressions=$HOME/target/tsan.supp:detect_deadlocks=0"
+    export TSAN_OPTIONS="suppressions=$HOME/target/tsan.supp"
 fi
 
 if [[ ${ZUUL_JOB_NAME%%-cover?(-previous|-diff)} =~ -gcc$ ]]; then

submodules/dependencies

diff --git a/submodules/dependencies b/submodules/dependencies
index dd031fa..7570525 160000
--- a/submodules/dependencies
+++ b/submodules/dependencies
@@ -1 +1 @@
-Subproject commit dd031fa7129ed2d4c48a4e461b2ba3a00593493e
+Subproject commit 7570525a6e64a4807e49d65e4515b8725989bac8

tests/datastore_access.cpp

diff --git a/tests/datastore_access.cpp b/tests/datastore_access.cpp
index ddfe288..ececd0c 100644
--- a/tests/datastore_access.cpp
+++ b/tests/datastore_access.cpp
@@ -100,7 +100,7 @@
             std::ofstream of(testConfigFile);
             of << dump(DataFormat::Xml);
         }
-        auto command = std::string(sysrepocfgExecutable) + " --import=" + testConfigFile + " --format=xml --datastore=running --module=example-schema -w";
+        auto command = std::string(sysrepocfgExecutable) + " --import=" + testConfigFile + " --format=xml --datastore=running --module=example-schema";
         REQUIRE(std::system(command.c_str()) == 0);
     }
 };

tests/init_datastore.bash.in

diff --git a/tests/init_datastore.bash.in b/tests/init_datastore.bash.in
index a4ac0df..51eaf1c 100755
--- a/tests/init_datastore.bash.in
+++ b/tests/init_datastore.bash.in
@@ -1,5 +1,4 @@
 set -eux
-export UBSAN_OPTIONS=halt_on_error=1 # UBSan doesn't stop on errors by default.
 
 if [[ $(dirname "$(dirname "$(realpath "$SYSREPO_REPOSITORY_PATH")")") != "@CMAKE_CURRENT_BINARY_DIR@" ]]; then
     echo "\$SYSREPO_REPOSITORY_PATH is not inside the build dir! Aborting. ($SYSREPO_REPOSITORY_PATH)"