Skip to content

Commit 7c31bc8

Browse files
deanberrisdeanberris
committed
Jamfile Fixes.
This commit updates the Jamfile for working with the latest Boost.Build and Jam specification from the Boost SVN trunk as of April 10, 2011.
1 parent 99349ab commit 7c31bc8

File tree

4 files changed

+58
-23
lines changed

4 files changed

+58
-23
lines changed

‎Jamroot

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import os ;
99
local BOOST_ROOT = [ os.environ BOOST_ROOT ] ;
1010

1111
use-project /boost : $(BOOST_ROOT) ;
12+
use-project /cpp-netlib : libs/network/build ;
1213

1314
using testing ;
1415

‎libs/network/build/Jamfile.v2

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
# (See accompanying file LICENSE_1_0.txt or copy at
55
# http://www.boost.org/LICENSE_1_0.txt)
66

7+
import os ;
8+
9+
local BOOST_ROOT = [ os.environ BOOST_ROOT ] ;
10+
711
project cpp-netlib :
812
requirements
913
<include>../../../

‎libs/network/test/Jamfile.v2

+6-23
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# (See accompanying file LICENSE_1_0.txt or copy at
55
# http://www.boost.org/LICENSE_1_0.txt)
66

7+
import testing ;
78
import os ;
89

910
if [ os.name ] = CYGWIN
@@ -40,28 +41,10 @@ project network_test :
4041
<link>static
4142
;
4243

43-
unit-test http_localhost_tests : http_localhost_tests.cpp /cpp-netlib//cppnetlib-uri-parsers ;
44-
unit-test https_localhost_tests : https_localhost_tests.cpp /cpp-netlib//cppnetlib-uri-parsers ;
45-
unit-test message_test : message_test.cpp ;
46-
unit-test message_transform_test : message_transform_test.cpp ;
47-
unit-test http_message_test : http_message_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
48-
unit-test url_test : url_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
49-
unit-test client_server_include_failure : client_server_include_failure.cpp ;
50-
unit-test http_incremental_parser : http_incremental_parser.cpp ;
51-
unit-test http_incremental_request_parser : http_incremental_request_parser.cpp ;
52-
unit-test http_async_message_ready : http_async_message_ready.cpp /cpp-netlib//cppnetlib-uri-parsers ;
44+
build-project http ;
5345

54-
unit-test http_client_constructor_test : http/client_constructor_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
55-
unit-test http_client_get_test : http/client_get_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
56-
unit-test http_client_get_different_port_test : http/client_get_different_port_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
57-
unit-test http_client_get_timeout_test : http/client_get_timeout_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
58-
59-
exe http_async_server : http/server_async.cpp /cpp-netlib//cppnetlib-server-parsers ;
60-
exe hello_world : http/server_hello_world.cpp /cpp-netlib//cppnetlib-server-parsers ;
61-
62-
make httplib_acceptance.passed : httplib_acceptance.py hello_world : @python_runner ;
63-
make httplib_async_acceptance.passed : httplib_acceptance.py http_async_server : @python_runner ;
64-
actions python_runner {
65-
python $(>) $(<)
66-
}
46+
run message_test.cpp ;
47+
run message_transform_test.cpp ;
48+
run url_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
49+
run client_server_include_failure.cpp ;
6750

‎libs/network/test/http/Jamfile.v2

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
2+
# Copyright 2011 Dean Michael Berris.
3+
# Distributed under the Boost Software License, Version 1.0.
4+
# (See accompanying file LICENSE_1_0.txt or copy at
5+
# http://www.boost.org/LICENSE_1_0.txt)
6+
7+
import testing ;
8+
import modules ;
9+
import feature ;
10+
11+
project network_test/http :
12+
requirements
13+
<include>../../../../
14+
<include>../
15+
;
16+
17+
run client_constructor_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
18+
run client_get_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
19+
run client_get_different_port_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
20+
run client_get_timeout_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
21+
run client_include_inlined.cpp : <define>BOOST_NETWORK_NO_LIB ;
22+
run client_localhost_normal_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
23+
run client_localhost_ssl_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
24+
run message_async_ready_test.cpp ;
25+
run message_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
26+
run request_incremental_parser_test.cpp ;
27+
run request_linearize_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
28+
run response_incremental_parser_test.cpp /cpp-netlib//cppnetlib-server-parsers ;
29+
run server_constructor_test.cpp /cpp-netlib//cppnetlib-server-parsers ;
30+
run server_include_inlined.cpp : <define>BOOST_NETWORK_NO_LIB ;
31+
run url_test.cpp /cpp-netlib//cppnetlib-uri-parsers ;
32+
33+
exe http_async_server : server_async.cpp /cpp-netlib//cppnetlib-server-parsers ;
34+
exe hello_world : server_hello_world.cpp /cpp-netlib//cppnetlib-server-parsers ;
35+
exe http_async_less_copy_server : server_async_less_copy.cpp /cpp-netlib//cppnetlib-server-parsers ;
36+
37+
make httplib_acceptance.passed : ../httplib_acceptance.py hello_world : @httplib_acceptance ;
38+
make httplib_async_acceptance.passed : ../httplib_acceptance.py http_async_server : @httplib_acceptance ;
39+
make httplib_async_less_copy_acceptance.passed : ../httplib_acceptance.py http_async_less_copy_server : @httplib_acceptance
40+
41+
actions httplib_acceptance {
42+
export TEST_SCRIPT=`echo "$(>)" | awk '{print $1}'`
43+
export EXECUTABLE=`echo "$(>)" | awk '{print $2}'`
44+
export PORT=`echo "import random; print random.randint(8000, 8010)" | python`
45+
python $TEST_SCRIPT $EXECUTABLE $PORT $(<)
46+
}
47+

0 commit comments

Comments
 (0)