Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 21:47:15 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #18399 from LabNConsulting/chopps/fix-unit-tests

Browse source 
2 unit-test fixes
This commit is contained in:
Donatas Abraitis 2025-03-16 15:14:55 +01:00 committed by GitHub
parent f2245941d8 bc3f7d9c07
commit c288e5fbaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -1054,6 +1054,11 @@ AC_MSG_FAILURE([Please specify a number from 0-12 for log precision ARG])
;; ;;
esac esac
with_log_timestamp_precision=${with_log_timestamp_precision:-0} with_log_timestamp_precision=${with_log_timestamp_precision:-0}
if test "${with_log_timestamp_precision}" != 0; then
AC_SUBST([LOG_TIMESTAMP_PRECISION_CLI], ["
log timestamp precision ${with_log_timestamp_precision}"])
AM_SUBST_NOTMAKE([LOG_TIMESTAMP_PRECISION_CLI])
fi
AC_DEFINE_UNQUOTED([LOG_TIMESTAMP_PRECISION], [${with_log_timestamp_precision}], [Startup zlog timestamp precision]) AC_DEFINE_UNQUOTED([LOG_TIMESTAMP_PRECISION], [${with_log_timestamp_precision}], [Startup zlog timestamp precision])
AC_DEFINE_UNQUOTED([VTYSH_PAGER], ["$VTYSH_PAGER"], [What pager to use]) AC_DEFINE_UNQUOTED([VTYSH_PAGER], ["$VTYSH_PAGER"], [What pager to use])

4
tests/lib/cli/test_cli.refout.in
View file

@ -405,7 +405,7 @@ frr version @PACKAGE_VERSION@
frr defaults @DFLT_NAME@ frr defaults @DFLT_NAME@
! !
hostname test hostname test
domainname test.domain domainname test.domain@LOG_TIMESTAMP_PRECISION_CLI@
! !
! !
! !
@ -420,7 +420,7 @@ frr version @PACKAGE_VERSION@
frr defaults @DFLT_NAME@ frr defaults @DFLT_NAME@
! !
hostname foohost hostname foohost
domainname test.domain domainname test.domain@LOG_TIMESTAMP_PRECISION_CLI@
! !
! !
! !

6
tests/lib/northbound/test_oper_exists.c
View file

@ -157,13 +157,15 @@ const char *data_json = "\n"
"}\n"; "}\n";
static const struct lyd_node *test_oper_get_tree_locked(const char *xpath) static const struct lyd_node *test_oper_get_tree_locked(const char *xpath __attribute__((unused)),
void **lock __attribute__((unused)))
{ {
++data_tree_lock; ++data_tree_lock;
return data_tree; return data_tree;
} }
static void test_oper_unlock_tree(const struct lyd_node *tree __attribute__((unused))) static void test_oper_unlock_tree(const struct lyd_node *tree __attribute__((unused)),
void *lock __attribute__((unused)))
{ {
data_tree_lock--; data_tree_lock--;
} }