ci: sync scripts
Change-Id: I7ef875e554dfd300e4e3464db1221bdf65f4ab25
diff --git a/.jenkins.d/20-tests.sh b/.jenkins.d/20-tests.sh
index 75c66dc..94c4893 100755
--- a/.jenkins.d/20-tests.sh
+++ b/.jenkins.d/20-tests.sh
@@ -8,22 +8,7 @@
security unlock-keychain -p named-data
fi
-ndnsec-keygen "/tmp/jenkins/$NODE_NAME" | ndnsec-install-cert -
-
-BOOST_VERSION=$(python3 -c "import sys; sys.path.append('build/c4che'); import _cache; print(_cache.BOOST_VERSION_NUMBER);")
-
-ut_log_args() {
- if (( BOOST_VERSION >= 106200 )); then
- echo --logger=HRF,test_suite,stdout:XML,all,build/xunit-${1:-report}.xml
- else
- if [[ -n $XUNIT ]]; then
- echo --log_level=all $( (( BOOST_VERSION >= 106000 )) && echo -- ) \
- --log_format2=XML --log_sink2=build/xunit-${1:-report}.xml
- else
- echo --log_level=test_suite
- fi
- fi
-}
+ndnsec key-gen "/tmp/jenkins/$NODE_NAME" | ndnsec cert-install -
# https://github.com/google/sanitizers/wiki/AddressSanitizerFlags
ASAN_OPTIONS="color=always"
@@ -38,6 +23,8 @@
export BOOST_TEST_BUILD_INFO=1
export BOOST_TEST_COLOR_OUTPUT=1
+export BOOST_TEST_DETECT_MEMORY_LEAK=0
+export BOOST_TEST_LOGGER=HRF,test_suite,stdout:XML,all,build/xunit-log.xml
# Run unit tests
-./build/unit-tests $(ut_log_args)
+./build/unit-tests