From 70d52bc2a8161a0c33adc46ea912296c26a9ff4f Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 27 Apr 2017 00:00:35 -0700 Subject: [PATCH] [REMOVE] isolate handshake test --- .travis.yml | 2 +- CMakeLists.txt | 11 ----- Jamroot | 1 - test/Jamfile | 83 ----------------------------------- test/websocket/CMakeLists.txt | 7 --- test/websocket/stream.cpp | 4 ++ 6 files changed, 5 insertions(+), 103 deletions(-) diff --git a/.travis.yml b/.travis.yml index 236e8da718..fe86fa15c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,4 +83,4 @@ after_script: notifications: email: - false + false \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 24e48ade78..ed8c97cc18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,15 +166,4 @@ file(GLOB_RECURSE EXTRAS_INCLUDES ${PROJECT_SOURCE_DIR}/extras/beast/*.ipp ) -add_subdirectory (examples) -if (NOT OPENSSL_FOUND) - message("OpenSSL not found. Not building examples/ssl") -else() - add_subdirectory (examples/ssl) -endif() - -add_subdirectory (test) -add_subdirectory (test/core) -add_subdirectory (test/http) add_subdirectory (test/websocket) -add_subdirectory (test/zlib) diff --git a/Jamroot b/Jamroot index e5ef9f0a3f..aa9c5695c4 100644 --- a/Jamroot +++ b/Jamroot @@ -127,4 +127,3 @@ project beast ; build-project test ; -build-project examples ; diff --git a/test/Jamfile b/test/Jamfile index 75f0d2fcf7..422f5aec01 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -7,71 +7,6 @@ import os ; -compile config.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/bind_handler.cpp - core/buffer_cat.cpp - core/buffer_concepts.cpp - core/buffers_adapter.cpp - core/clamp.cpp - core/consuming_buffers.cpp - core/dynabuf_readstream.cpp - core/error.cpp - core/flat_streambuf.cpp - core/handler_alloc.cpp - core/handler_concepts.cpp - core/handler_ptr.cpp - core/placeholders.cpp - core/prepare_buffer.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/is_call_possible.cpp - core/sha1.cpp - ; - -unit-test http-tests : - ../extras/beast/unit_test/main.cpp - http/basic_dynabuf_body.cpp - http/basic_fields.cpp - http/basic_parser.cpp - http/concepts.cpp - http/design.cpp - http/error.cpp - http/fields.cpp - http/header_parser.cpp - http/message.cpp - http/message_parser.cpp - http/read.cpp - http/reason.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 websocket-tests : ../extras/beast/unit_test/main.cpp websocket/error.cpp @@ -83,21 +18,3 @@ unit-test websocket-tests : websocket/mask.cpp websocket/utf8_checker.cpp ; - -unit-test zlib-tests : - ../extras/beast/unit_test/main.cpp - zlib/zlib-1.2.8/adler32.c - zlib/zlib-1.2.8/compress.c - zlib/zlib-1.2.8/crc32.c - zlib/zlib-1.2.8/deflate.c - zlib/zlib-1.2.8/infback.c - zlib/zlib-1.2.8/inffast.c - zlib/zlib-1.2.8/inflate.c - zlib/zlib-1.2.8/inftrees.c - zlib/zlib-1.2.8/trees.c - zlib/zlib-1.2.8/uncompr.c - zlib/zlib-1.2.8/zutil.c - zlib/deflate_stream.cpp - zlib/error.cpp - zlib/inflate_stream.cpp - ; diff --git a/test/websocket/CMakeLists.txt b/test/websocket/CMakeLists.txt index 5d2856edb3..e73a784370 100644 --- a/test/websocket/CMakeLists.txt +++ b/test/websocket/CMakeLists.txt @@ -10,14 +10,7 @@ add_executable (websocket-tests ../../extras/beast/unit_test/main.cpp websocket_async_echo_server.hpp websocket_sync_echo_server.hpp - error.cpp - option.cpp - rfc6455.cpp stream.cpp - teardown.cpp - frame.cpp - mask.cpp - utf8_checker.cpp ) if (NOT WIN32) diff --git a/test/websocket/stream.cpp b/test/websocket/stream.cpp index a2819bd8bc..7db3a426a0 100644 --- a/test/websocket/stream.cpp +++ b/test/websocket/stream.cpp @@ -1786,9 +1786,12 @@ class stream_test auto const any = endpoint_type{ address_type::from_string("127.0.0.1"), 0}; +#if 0 testOptions(); testAccept(); +#endif testHandshake(); +#if 0 testBadHandshakes(); testBadResponses(); @@ -1871,6 +1874,7 @@ class stream_test pmd.client_max_window_bits = 10; pmd.client_no_context_takeover = true; doClientTests(pmd); +#endif } };