From f6d3bb97e4a619283f4926bcda0e63030b8a0024 Mon Sep 17 00:00:00 2001 From: Wouter Verhelst Date: Wed, 4 Apr 2018 15:22:30 +0200 Subject: [PATCH] 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. --- configure.ac | 6 ++++++ tests/run/Makefile.am | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0940b47..7b63ca1 100644 --- a/configure.ac +++ b/configure.ac @@ -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])) diff --git a/tests/run/Makefile.am b/tests/run/Makefile.am index f25f786..f41eb8d 100644 --- a/tests/run/Makefile.am +++ b/tests/run/Makefile.am @@ -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 -- 2.11.4.GIT