Skip to content

Commit

Permalink
[FOLD] restore build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
vinniefalco committed Oct 24, 2016
1 parent f132aa1 commit 77ba5bb
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 82 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@ file(GLOB_RECURSE EXTRAS_INCLUDES
${PROJECT_SOURCE_DIR}/extras/beast/*.ipp
)

#add_subdirectory (examples)
add_subdirectory (examples)
if (NOT OPENSSL_FOUND)
message("OpenSSL not found. Not building examples/ssl")
else()
#add_subdirectory (examples/ssl)
add_subdirectory (examples/ssl)
endif()

#add_subdirectory (test)
#add_subdirectory (test/core)
#add_subdirectory (test/http)
#add_subdirectory (test/websocket)
add_subdirectory (test)
add_subdirectory (test/core)
add_subdirectory (test/http)
add_subdirectory (test/websocket)
add_subdirectory (test/zlib)
2 changes: 1 addition & 1 deletion Jamroot
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ project beast
;

build-project test ;
#build-project examples ;
build-project examples ;
146 changes: 73 additions & 73 deletions test/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,85 +7,85 @@

import os ;

#compile core.cpp : : ;
#compile http.cpp : : ;
#compile version.cpp : : ;
#compile websocket.cpp : : ;
compile core.cpp : : ;
compile http.cpp : : ;
compile version.cpp : : ;
compile websocket.cpp : : ;
compile zlib.cpp : : ;

#unit-test core-tests :
# ../extras/beast/unit_test/main.cpp
# core/async_completion.cpp
# core/basic_streambuf.cpp
# core/bind_handler.cpp
# core/buffer_cat.cpp
# core/buffer_concepts.cpp
# core/buffers_adapter.cpp
# core/consuming_buffers.cpp
# core/dynabuf_readstream.cpp
# core/error.cpp
# core/handler_alloc.cpp
# core/handler_concepts.cpp
# core/placeholders.cpp
# core/prepare_buffers.cpp
# core/static_streambuf.cpp
# core/static_string.cpp
# core/stream_concepts.cpp
# core/streambuf.cpp
# core/to_string.cpp
# core/write_dynabuf.cpp
# core/base64.cpp
# core/empty_base_optimization.cpp
# core/get_lowest_layer.cpp
# core/sha1.cpp
# ;
unit-test core-tests :
../extras/beast/unit_test/main.cpp
core/async_completion.cpp
core/basic_streambuf.cpp
core/bind_handler.cpp
core/buffer_cat.cpp
core/buffer_concepts.cpp
core/buffers_adapter.cpp
core/consuming_buffers.cpp
core/dynabuf_readstream.cpp
core/error.cpp
core/handler_alloc.cpp
core/handler_concepts.cpp
core/placeholders.cpp
core/prepare_buffers.cpp
core/static_streambuf.cpp
core/static_string.cpp
core/stream_concepts.cpp
core/streambuf.cpp
core/to_string.cpp
core/write_dynabuf.cpp
core/base64.cpp
core/empty_base_optimization.cpp
core/get_lowest_layer.cpp
core/sha1.cpp
;

#unit-test http-tests :
# ../extras/beast/unit_test/main.cpp
# http/basic_dynabuf_body.cpp
# http/basic_headers.cpp
# http/basic_parser_v1.cpp
# http/body_type.cpp
# http/concepts.cpp
# http/empty_body.cpp
# http/headers.cpp
# http/headers_parser_v1.cpp
# http/message.cpp
# http/parse.cpp
# http/parse_error.cpp
# http/parser_v1.cpp
# http/read.cpp
# http/reason.cpp
# http/resume_context.cpp
# http/rfc7230.cpp
# http/streambuf_body.cpp
# http/string_body.cpp
# http/write.cpp
# http/chunk_encode.cpp
# ;
unit-test http-tests :
../extras/beast/unit_test/main.cpp
http/basic_dynabuf_body.cpp
http/basic_headers.cpp
http/basic_parser_v1.cpp
http/body_type.cpp
http/concepts.cpp
http/empty_body.cpp
http/headers.cpp
http/headers_parser_v1.cpp
http/message.cpp
http/parse.cpp
http/parse_error.cpp
http/parser_v1.cpp
http/read.cpp
http/reason.cpp
http/resume_context.cpp
http/rfc7230.cpp
http/streambuf_body.cpp
http/string_body.cpp
http/write.cpp
http/chunk_encode.cpp
;

#unit-test bench-tests :
# ../extras/beast/unit_test/main.cpp
# http/nodejs_parser.cpp
# http/parser_bench.cpp
# ;
unit-test bench-tests :
../extras/beast/unit_test/main.cpp
http/nodejs_parser.cpp
http/parser_bench.cpp
;

#unit-test websocket-tests :
# ../extras/beast/unit_test/main.cpp
# websocket/error.cpp
# websocket/option.cpp
# websocket/rfc6455.cpp
# websocket/stream.cpp
# websocket/teardown.cpp
# websocket/frame.cpp
# websocket/mask.cpp
# websocket/stream_base.cpp
# websocket/utf8_checker.cpp
# ;
unit-test websocket-tests :
../extras/beast/unit_test/main.cpp
websocket/error.cpp
websocket/option.cpp
websocket/rfc6455.cpp
websocket/stream.cpp
websocket/teardown.cpp
websocket/frame.cpp
websocket/mask.cpp
websocket/stream_base.cpp
websocket/utf8_checker.cpp
;

#exe websocket-echo :
# websocket/websocket_echo.cpp
# ;
exe websocket-echo :
websocket/websocket_echo.cpp
;

unit-test zlib-tests :
../extras/beast/unit_test/main.cpp
Expand Down
3 changes: 1 addition & 2 deletions test/zlib/deflate_stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,7 @@ class deflate_stream_test : public beast::unit_test::suite
void
run() override
{
//testDeflate();
pass();
testDeflate();
}
};

Expand Down

0 comments on commit 77ba5bb

Please sign in to comment.