From: Michael Wallner Date: Tue, 27 Oct 2020 20:05:16 +0000 (+0100) Subject: testing: freebsd [travis skip] X-Git-Tag: 1.1.0-beta1~150 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6902b8f64cb873d294e75867a8150bc1e13f9bed;p=m6w6%2Flibmemcached testing: freebsd [travis skip] --- diff --git a/test/lib/ForkAndExec.cpp b/test/lib/ForkAndExec.cpp index 48a8dc18..ac30dd02 100644 --- a/test/lib/ForkAndExec.cpp +++ b/test/lib/ForkAndExec.cpp @@ -107,7 +107,7 @@ void ForkAndExec::closePipe(int &fd) { } void ForkAndExec::pollExecReadyPipe() { -#if __APPLE__ || __FreeBSD__ +#if __APPLE__ char c, n = 50; do { if (0 == read(ready[mode::READ], &c, 1)) { diff --git a/test/tests/memcached/errors.cpp b/test/tests/memcached/errors.cpp index c143b27f..4b3b4684 100644 --- a/test/tests/memcached/errors.cpp +++ b/test/tests/memcached/errors.cpp @@ -23,11 +23,7 @@ TEST_CASE("memcached_errors") { REQUIRE_SUCCESS(memcached_set(memc, S("foo"), nullptr, 0, 0, 0)); memcached_quit(memc); - test.cluster.stop( -#if __FreeBSD__ - true // graceful -#endif - ); + test.cluster.stop(); Retry cluster_is_stopped{[&cluster = test.cluster]{ return cluster.isStopped(); }};