Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Actually do run tlshuge, but allow for a failure
Disabling tlshuge entirely means we don't test it on Linux either, where
it does succeed. Rather than doing that, mark it as an expected failure
on OSX.

We can fix it later, then.
  • Loading branch information
yoe committed Apr 4, 2018
1 parent 3306080 commit f6d3bb9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions configure.ac
Expand Up @@ -255,6 +255,12 @@ case $host_os in
AC_MSG_RESULT(no)
;;
esac
AC_MSG_CHECKING(whether to expect tlshuge test to fail)
AS_CASE([$host_os],
[darwin*], [RUN_XFAIL=tlshuge; AC_MSG_RESULT(yes)],
[RUN_XFAIL=""; AC_MSG_RESULT(no)]
)
AC_SUBST([RUN_XFAIL])
AM_CONDITIONAL(CLIENT, [test ! -z "$NBD_CLIENT_NAME"])
AC_SEARCH_LIBS(bind, socket,, AC_MSG_ERROR([Could not find an implementation of the bind() system call]))
AC_SEARCH_LIBS(inet_ntoa, nsl,, AC_MSG_ERROR([Could not find an implementation of the inet_ntoa() system call]))
Expand Down
3 changes: 2 additions & 1 deletion tests/run/Makefile.am
Expand Up @@ -5,7 +5,8 @@ TLSSRC =
endif
TESTS_ENVIRONMENT=$(srcdir)/simple_test
TESTS = cfg1 cfgmulti cfgnew cfgsize write flush integrity dirconfig list inetd \
rowrite tree rotree unix integrityhuge handshake tls tlswrongcert # tlshuge
rowrite tree rotree unix integrityhuge handshake tls tlswrongcert tlshuge
XFAIL_TESTS=@RUN_XFAIL@
check_PROGRAMS = nbd-tester-client
nbd_tester_client_SOURCES = nbd-tester-client.c
nodist_nbd_tester_client_SOURCES = cliserv.c
Expand Down

0 comments on commit f6d3bb9

Please sign in to comment.