Commit24f3a44

committed

Merge pull request#534 from deanberris/0.11-devel-osx-fix-tests

Fix test failures in os x

2 parentse17e8cd +33b5402 commit24f3a44Copy full SHA for 24f3a44

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,8 @@ if (Boost_FOUND)`
`39`	`39`	`${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})`
`40`	`40`	`endforeach (test)`
`41`	`41`
	`42`	`+# Also copy the server directory to the root of the build directory.`
	`43`	`+ file(COPY serverDESTINATION ${CPP-NETLIB_BINARY_DIR}/libs/network/test/)`
	`44`	`+`
`42`	`45`	`endif()`
`43`	`46`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,20 +5,25 @@`
`5`	`5`	`// http://www.boost.org/LICENSE_1_0.txt)`
`6`	`6`
`7`	`7`	`#defineBOOST_TEST_MODULE HTTP Client Get Timeout Test`
	`8`	`+#include<cstdlib>`
`8`	`9`	`#include<boost/network/include/http/client.hpp>`
`9`	`10`	`#include<boost/test/unit_test.hpp>`
`10`	`11`	`#include"client_types.hpp"`
`11`	`12`	`#include"http_test_server.hpp"`
`12`	`13`
`13`	`14`	`structlocalhost_server_fixture {`
`14`	`15`	`localhost_server_fixture() {`
`15`		`-if (!server.start())`
	`16`	`+if (!server.start()) {`
`16`	`17`	`std::cout <<"Failed to start HTTP server for test!" << std::endl;`
	`18`	`+std::abort();`
	`19`	`+ }`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`~localhost_server_fixture() {`
`20`		`-if (!server.stop())`
	`23`	`+if (!server.stop()) {`
`21`	`24`	`std::cout <<"Failed to stop HTTP server for test!" << std::endl;`
	`25`	`+std::abort();`
	`26`	`+ }`
`22`	`27`	`}`
`23`	`28`
`24`	`29`	`http_test_server server;`

Comments

(0)