Skip to content

Commit

Permalink
tests: Restructure tests directory
Browse files Browse the repository at this point in the history
All unit tests go in the `unit` subdirectory. These are tests which
should gate a release of Seastar, or prevent a branch from merging. They
can be run automatically and without human supervision.

All performance tests go in the `perf` subdirectory.

Application-specific tests move to the application-specific subdirectory
in `apps`.

Small tests which demonstrate or validate functionality of Seastar but
which require human intervention have been moved to the `demos`
directory.
  • Loading branch information
Jesse Haber-Kucharsky committed Nov 20, 2018
1 parent 1a4f95b commit bd3c43f
Show file tree
Hide file tree
Showing 75 changed files with 202 additions and 199 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
278 changes: 139 additions & 139 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,65 +253,65 @@ def configure_fmt(mode, cxx='g++', cc='gcc'):
]

tests = [
'tests/file_io_test',
'tests/directory_test',
'tests/linecount',
'tests/echotest',
'tests/l3_test',
'tests/ip_test',
'tests/timer_test',
'tests/tcp_test',
'tests/futures_test',
'tests/alloc_test',
'tests/foreign_ptr_test',
'tests/smp_test',
'tests/thread_test',
'tests/thread_context_switch_test',
'tests/udp_server',
'tests/udp_client',
'tests/blkdiscard_test',
'tests/sstring_test',
'tests/unwind_test',
'tests/defer_test',
'tests/httpd_test',
'tests/memcached/memcached_ascii_parser_test',
'tests/tcp_sctp_server',
'tests/tcp_sctp_client',
'tests/allocator_test',
'tests/output_stream_test',
'tests/udp_zero_copy',
'tests/shared_ptr_test',
'tests/weak_ptr_test',
'tests/checked_ptr_test',
'tests/slab_test',
'tests/fstream_test',
'tests/distributed_test',
'tests/rpc',
'tests/semaphore_test',
'tests/expiring_fifo_test',
'tests/packet_test',
'tests/tls_test',
'tests/fair_queue_test',
'tests/rpc_test',
'tests/connect_test',
'tests/chunked_fifo_test',
'tests/circular_buffer_test',
'tests/unit/file_io_test',
'tests/unit/directory_test',
'demos/linecount',
'demos/echotest',
'demos/l3_test',
'demos/ip_test',
'tests/unit/timer_test',
'demos/tcp_test',
'tests/unit/futures_test',
'tests/unit/alloc_test',
'tests/unit/foreign_ptr_test',
'tests/unit/smp_test',
'tests/unit/thread_test',
'tests/unit/thread_context_switch_test',
'demos/udp_server',
'demos/udp_client',
'demos/blkdiscard_test',
'tests/unit/sstring_test',
'tests/unit/unwind_test',
'tests/unit/defer_test',
'tests/unit/httpd_test',
'apps/memcached/tests/memcached_ascii_parser_test',
'demos/tcp_sctp_server',
'demos/tcp_sctp_client',
'tests/unit/allocator_test',
'tests/unit/output_stream_test',
'demos/udp_zero_copy',
'tests/unit/shared_ptr_test',
'tests/unit/weak_ptr_test',
'tests/unit/checked_ptr_test',
'tests/unit/slab_test',
'tests/unit/fstream_test',
'tests/unit/distributed_test',
'demos/rpc',
'tests/unit/semaphore_test',
'tests/unit/expiring_fifo_test',
'tests/unit/packet_test',
'tests/unit/tls_test',
'tests/unit/fair_queue_test',
'tests/unit/rpc_test',
'tests/unit/connect_test',
'tests/unit/chunked_fifo_test',
'tests/unit/circular_buffer_test',
'tests/perf/perf_fstream',
'tests/json_formatter_test',
'tests/dns_test',
'tests/execution_stage_test',
'tests/lowres_clock_test',
'tests/program_options_test',
'tests/tuple_utils_test',
'tests/tls_echo_server',
'tests/tls_simple_client',
'tests/circular_buffer_fixed_capacity_test',
'tests/noncopyable_function_test',
'tests/netconfig_test',
'tests/abort_source_test',
'tests/alien_test',
'tests/signal_test',
'tests/simple_stream_test',
'tests/unit/json_formatter_test',
'tests/unit/dns_test',
'tests/unit/execution_stage_test',
'tests/unit/lowres_clock_test',
'tests/unit/program_options_test',
'tests/unit/tuple_utils_test',
'demos/tls_echo_server',
'demos/tls_simple_client',
'tests/unit/circular_buffer_fixed_capacity_test',
'tests/unit/noncopyable_function_test',
'tests/unit/netconfig_test',
'tests/unit/abort_source_test',
'tests/unit/alien_test',
'tests/unit/signal_test',
'tests/unit/simple_stream_test',
] + perf_tests

apps = [
Expand All @@ -320,7 +320,7 @@ def configure_fmt(mode, cxx='g++', cc='gcc'):
'apps/io_tester/io_tester',
'apps/memcached/memcached',
'apps/iotune/iotune',
'tests/scheduling_group_demo',
'demos/scheduling_group_demo',
]

extralibs = {
Expand Down Expand Up @@ -579,93 +579,93 @@ def maybe_static(flag, libs):
'fmt/fmt/libfmt.a': [],
'apps/httpd/httpd': ['apps/httpd/demo.json', 'apps/httpd/main.cc'] + http + libnet + core,
'apps/memcached/memcached': ['apps/memcached/memcache.cc'] + memcache_base,
'tests/memcached/memcached_ascii_parser_test': ['tests/memcached/test_ascii_parser.cc'] + memcache_base,
'tests/file_io_test': ['tests/fileiotest.cc'] + core,
'tests/directory_test': ['tests/directory_test.cc'] + core,
'tests/linecount': ['tests/linecount.cc'] + core,
'tests/echotest': ['tests/echotest.cc'] + core + libnet,
'tests/l3_test': ['tests/l3_test.cc'] + core + libnet,
'tests/ip_test': ['tests/ip_test.cc'] + core + libnet,
'tests/tcp_test': ['tests/tcp_test.cc'] + core + libnet,
'tests/timer_test': ['tests/timertest.cc'] + core,
'tests/futures_test': ['tests/futures_test.cc'] + core,
'tests/alloc_test': ['tests/alloc_test.cc'] + core,
'tests/foreign_ptr_test': ['tests/foreign_ptr_test.cc'] + core,
'tests/semaphore_test': ['tests/semaphore_test.cc'] + core,
'tests/expiring_fifo_test': ['tests/expiring_fifo_test.cc'] + core,
'tests/smp_test': ['tests/smp_test.cc'] + core,
'tests/thread_test': ['tests/thread_test.cc'] + core,
'tests/thread_context_switch_test': ['tests/thread_context_switch.cc'] + core,
'tests/udp_server': ['tests/udp_server.cc'] + core + libnet,
'tests/udp_client': ['tests/udp_client.cc'] + core + libnet,
'tests/tcp_sctp_server': ['tests/tcp_sctp_server.cc'] + core + libnet,
'tests/tcp_sctp_client': ['tests/tcp_sctp_client.cc'] + core + libnet,
'tests/tls_test': ['tests/tls_test.cc'] + core + libnet,
'tests/fair_queue_test': ['tests/fair_queue_test.cc'] + core,
'apps/memcached/tests/memcached_ascii_parser_test': ['apps/memcached/tests/test_ascii_parser.cc'] + memcache_base,
'tests/unit/file_io_test': ['tests/unit/fileiotest.cc'] + core,
'tests/unit/directory_test': ['tests/unit/directory_test.cc'] + core,
'demos/linecount': ['demos/linecount.cc'] + core,
'demos/echotest': ['demos/echotest.cc'] + core + libnet,
'demos/l3_test': ['demos/l3_test.cc'] + core + libnet,
'demos/ip_test': ['demos/ip_test.cc'] + core + libnet,
'demos/tcp_test': ['demos/tcp_test.cc'] + core + libnet,
'tests/unit/timer_test': ['tests/unit/timertest.cc'] + core,
'tests/unit/futures_test': ['tests/unit/futures_test.cc'] + core,
'tests/unit/alloc_test': ['tests/unit/alloc_test.cc'] + core,
'tests/unit/foreign_ptr_test': ['tests/unit/foreign_ptr_test.cc'] + core,
'tests/unit/semaphore_test': ['tests/unit/semaphore_test.cc'] + core,
'tests/unit/expiring_fifo_test': ['tests/unit/expiring_fifo_test.cc'] + core,
'tests/unit/smp_test': ['tests/unit/smp_test.cc'] + core,
'tests/unit/thread_test': ['tests/unit/thread_test.cc'] + core,
'tests/unit/thread_context_switch_test': ['tests/unit/thread_context_switch.cc'] + core,
'demos/udp_server': ['demos/udp_server.cc'] + core + libnet,
'demos/udp_client': ['demos/udp_client.cc'] + core + libnet,
'demos/tcp_sctp_server': ['demos/tcp_sctp_server.cc'] + core + libnet,
'demos/tcp_sctp_client': ['demos/tcp_sctp_client.cc'] + core + libnet,
'tests/unit/tls_test': ['tests/unit/tls_test.cc'] + core + libnet,
'tests/unit/fair_queue_test': ['tests/unit/fair_queue_test.cc'] + core,
'apps/seawreck/seawreck': ['apps/seawreck/seawreck.cc', 'src/http/http_response_parser.rl'] + core + libnet,
'apps/io_tester/io_tester': ['apps/io_tester/io_tester.cc'] + core,
'apps/iotune/iotune': ['apps/iotune/iotune.cc'] + core,
'tests/blkdiscard_test': ['tests/blkdiscard_test.cc'] + core,
'tests/sstring_test': ['tests/sstring_test.cc'] + core,
'tests/unwind_test': ['tests/unwind_test.cc'] + core,
'tests/defer_test': ['tests/defer_test.cc'] + core,
'tests/httpd_test': ['tests/httpd.cc'] + http + core,
'tests/allocator_test': ['tests/allocator_test.cc'] + core,
'tests/output_stream_test': ['tests/output_stream_test.cc'] + core + libnet,
'tests/udp_zero_copy': ['tests/udp_zero_copy.cc'] + core + libnet,
'tests/shared_ptr_test': ['tests/shared_ptr_test.cc'] + core,
'tests/weak_ptr_test': ['tests/weak_ptr_test.cc'] + core,
'tests/checked_ptr_test': ['tests/checked_ptr_test.cc'] + core,
'tests/slab_test': ['tests/slab_test.cc'] + core,
'tests/fstream_test': ['tests/fstream_test.cc'] + core,
'tests/distributed_test': ['tests/distributed_test.cc'] + core,
'tests/rpc': ['tests/rpc.cc'] + core + libnet,
'tests/rpc_test': ['tests/rpc_test.cc'] + core + libnet,
'tests/packet_test': ['tests/packet_test.cc'] + core + libnet,
'tests/connect_test': ['tests/connect_test.cc'] + core + libnet,
'tests/chunked_fifo_test': ['tests/chunked_fifo_test.cc'] + core,
'tests/circular_buffer_test': ['tests/circular_buffer_test.cc'] + core,
'demos/blkdiscard_test': ['demos/blkdiscard_test.cc'] + core,
'tests/unit/sstring_test': ['tests/unit/sstring_test.cc'] + core,
'tests/unit/unwind_test': ['tests/unit/unwind_test.cc'] + core,
'tests/unit/defer_test': ['tests/unit/defer_test.cc'] + core,
'tests/unit/httpd_test': ['tests/unit/httpd.cc'] + http + core,
'tests/unit/allocator_test': ['tests/unit/allocator_test.cc'] + core,
'tests/unit/output_stream_test': ['tests/unit/output_stream_test.cc'] + core + libnet,
'demos/udp_zero_copy': ['demos/udp_zero_copy.cc'] + core + libnet,
'tests/unit/shared_ptr_test': ['tests/unit/shared_ptr_test.cc'] + core,
'tests/unit/weak_ptr_test': ['tests/unit/weak_ptr_test.cc'] + core,
'tests/unit/checked_ptr_test': ['tests/unit/checked_ptr_test.cc'] + core,
'tests/unit/slab_test': ['tests/unit/slab_test.cc'] + core,
'tests/unit/fstream_test': ['tests/unit/fstream_test.cc'] + core,
'tests/unit/distributed_test': ['tests/unit/distributed_test.cc'] + core,
'demos/rpc': ['demos/rpc.cc'] + core + libnet,
'tests/unit/rpc_test': ['tests/unit/rpc_test.cc'] + core + libnet,
'tests/unit/packet_test': ['tests/unit/packet_test.cc'] + core + libnet,
'tests/unit/connect_test': ['tests/unit/connect_test.cc'] + core + libnet,
'tests/unit/chunked_fifo_test': ['tests/unit/chunked_fifo_test.cc'] + core,
'tests/unit/circular_buffer_test': ['tests/unit/circular_buffer_test.cc'] + core,
'tests/perf/perf_fstream': ['tests/perf/perf_fstream.cc'] + core,
'tests/json_formatter_test': ['tests/json_formatter_test.cc'] + core + http,
'tests/dns_test': ['tests/dns_test.cc'] + core + libnet,
'tests/execution_stage_test': ['tests/execution_stage_test.cc'] + core,
'tests/lowres_clock_test': ['tests/lowres_clock_test.cc'] + core,
'tests/program_options_test': ['tests/program_options_test.cc'] + core,
'tests/tuple_utils_test': ['tests/tuple_utils_test.cc'],
'tests/tls_echo_server': ['tests/tls_echo_server.cc'] + core + libnet,
'tests/tls_simple_client': ['tests/tls_simple_client.cc'] + core + libnet,
'tests/circular_buffer_fixed_capacity_test': ['tests/circular_buffer_fixed_capacity_test.cc'],
'tests/scheduling_group_demo': ['tests/scheduling_group_demo.cc'] + core,
'tests/noncopyable_function_test': ['tests/noncopyable_function_test.cc'],
'tests/netconfig_test': ['tests/netconfig_test.cc'] + core + libnet,
'tests/abort_source_test': ['tests/abort_source_test.cc'] + core,
'tests/alien_test': ['tests/alien_test.cc'] + core,
'tests/signal_test': ['tests/signal_test.cc'] + core,
'tests/simple_stream_test': ['tests/simple_stream_test.cc'] + core,
'tests/unit/json_formatter_test': ['tests/unit/json_formatter_test.cc'] + core + http,
'tests/unit/dns_test': ['tests/unit/dns_test.cc'] + core + libnet,
'tests/unit/execution_stage_test': ['tests/unit/execution_stage_test.cc'] + core,
'tests/unit/lowres_clock_test': ['tests/unit/lowres_clock_test.cc'] + core,
'tests/unit/program_options_test': ['tests/unit/program_options_test.cc'] + core,
'tests/unit/tuple_utils_test': ['tests/unit/tuple_utils_test.cc'],
'demos/tls_echo_server': ['demos/tls_echo_server.cc'] + core + libnet,
'demos/tls_simple_client': ['demos/tls_simple_client.cc'] + core + libnet,
'tests/unit/circular_buffer_fixed_capacity_test': ['tests/unit/circular_buffer_fixed_capacity_test.cc'],
'demos/scheduling_group_demo': ['demos/scheduling_group_demo.cc'] + core,
'tests/unit/noncopyable_function_test': ['tests/unit/noncopyable_function_test.cc'],
'tests/unit/netconfig_test': ['tests/unit/netconfig_test.cc'] + core + libnet,
'tests/unit/abort_source_test': ['tests/unit/abort_source_test.cc'] + core,
'tests/unit/alien_test': ['tests/unit/alien_test.cc'] + core,
'tests/unit/signal_test': ['tests/unit/signal_test.cc'] + core,
'tests/unit/simple_stream_test': ['tests/unit/simple_stream_test.cc'] + core,
}

boost_tests = [
'tests/memcached/memcached_ascii_parser_test',
'tests/file_io_test',
'tests/futures_test',
'tests/alloc_test',
'tests/foreign_ptr_test',
'tests/semaphore_test',
'tests/expiring_fifo_test',
'tests/thread_test',
'tests/tls_test',
'tests/fair_queue_test',
'tests/httpd_test',
'tests/output_stream_test',
'tests/fstream_test',
'tests/rpc_test',
'tests/connect_test',
'tests/json_formatter_test',
'tests/dns_test',
'tests/execution_stage_test',
'tests/lowres_clock_test',
'tests/abort_source_test',
'tests/signal_test',
'apps/memcached/tests/memcached_ascii_parser_test',
'tests/unit/file_io_test',
'tests/unit/futures_test',
'tests/unit/alloc_test',
'tests/unit/foreign_ptr_test',
'tests/unit/semaphore_test',
'tests/unit/expiring_fifo_test',
'tests/unit/thread_test',
'tests/unit/tls_test',
'tests/unit/fair_queue_test',
'tests/unit/httpd_test',
'tests/unit/output_stream_test',
'tests/unit/fstream_test',
'tests/unit/rpc_test',
'tests/unit/connect_test',
'tests/unit/json_formatter_test',
'tests/unit/dns_test',
'tests/unit/execution_stage_test',
'tests/unit/lowres_clock_test',
'tests/unit/abort_source_test',
'tests/unit/signal_test',
]

for bt in boost_tests:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit bd3c43f

Please sign in to comment.