diff --git a/.gitmodules b/.gitmodules index d6d6e33d76..26ed387eda 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "seastar"] path = seastar - url = ../scylla-seastar + url = ../seastar ignore = dirty [submodule "swagger-ui"] path = swagger-ui diff --git a/configure.py b/configure.py index 06f5cb93cb..89f7b27ac7 100755 --- a/configure.py +++ b/configure.py @@ -775,11 +775,6 @@ scylla_tests_dependencies = scylla_core + idls + [ 'tests/mutation_source_test.cc', ] -scylla_tests_seastar_deps = [ - 'seastar/tests/test-utils.cc', - 'seastar/tests/test_runner.cc', -] - deps = { 'scylla': idls + ['main.cc', 'release.cc'] + scylla_core + api, } @@ -848,7 +843,6 @@ for t in scylla_tests: deps[t] = [t + '.cc'] if t not in tests_not_using_seastar_test_framework: deps[t] += scylla_tests_dependencies - deps[t] += scylla_tests_seastar_deps else: deps[t] += scylla_core + idls + ['tests/cql_test_env.cc'] @@ -880,6 +874,8 @@ deps['tests/small_vector_test'] = ['tests/small_vector_test.cc'] deps['utils/gz/gen_crc_combine_table'] = ['utils/gz/gen_crc_combine_table.cc'] warnings = [ + '-Wall', + '-Werror', '-Wno-mismatched-tags', # clang-only '-Wno-maybe-uninitialized', # false positives on gcc 5 '-Wno-tautological-compare', @@ -893,7 +889,11 @@ warnings = [ '-Wno-misleading-indentation', '-Wno-overflow', '-Wno-noexcept-type', - '-Wno-nonnull-compare' + '-Wno-nonnull-compare', + '-Wno-error=cpp', + '-Wno-ignored-attributes', + '-Wno-overloaded-virtual', + '-Wno-stringop-overflow', ] warnings = [w @@ -1019,21 +1019,15 @@ seastar_flags = [] if args.dpdk: # fake dependencies on dpdk, so that it is built before anything else seastar_flags += ['--enable-dpdk'] -elif args.dpdk_target: - seastar_flags += ['--dpdk-target', args.dpdk_target] -if args.staticcxx: - seastar_flags += ['--static-stdc++'] -if args.staticboost: - seastar_flags += ['--static-boost'] -if args.staticyamlcpp: - seastar_flags += ['--static-yaml-cpp'] if args.gcc6_concepts: seastar_flags += ['--enable-gcc6-concepts'] if args.alloc_failure_injector: seastar_flags += ['--enable-alloc-failure-injector'] +args.user_cflags += ' ' + debug_compress_flag(compiler=args.cxx) +args.user_cflags += ' ' + dbgflag seastar_cflags = args.user_cflags -seastar_cflags += ' ' + debug_compress_flag(compiler=args.cxx) +seastar_cflags += ' -Wno-error' if args.target != '': seastar_cflags += ' -march=' + args.target seastar_ldflags = args.user_ldflags @@ -1054,10 +1048,6 @@ ninja = find_executable('ninja') or find_executable('ninja-build') if not ninja: print('Ninja executable (ninja or ninja-build) not found on PATH\n') sys.exit(1) -status = subprocess.call([ninja] + list(pc.values()), cwd='seastar') -if status: - print('Failed to generate {}\n'.format(pc)) - sys.exit(1) def query_seastar_flags(seastar_pc_file, link_static_cxx=False): pc_file = os.path.join('seastar', seastar_pc_file) @@ -1067,13 +1057,6 @@ def query_seastar_flags(seastar_pc_file, link_static_cxx=False): if link_static_cxx: libs = libs.replace('-lstdc++ ', '') - # Amend the incorrect flags in the pkg-config file to point to the - # right place. This is a temporary hack until we switch to the new - # pkg-config specification. - cflags = (cflags - .replace('-I. ', '') - .replace('-Iinclude ', '-I' + os.path.join('seastar', 'include') + ' ')) - return cflags, libs for mode in build_modes: @@ -1082,6 +1065,7 @@ for mode in build_modes: modes[mode]['seastar_libs'] = seastar_libs args.user_cflags += " " + pkg_config('jsoncpp', '--cflags') +args.user_cflags += ' -march=' + args.target libs = ' '.join([maybe_static(args.staticyamlcpp, '-lyaml-cpp'), '-latomic', '-llz4', '-lz', '-lsnappy', pkg_config('jsoncpp', '--libs'), maybe_static(args.staticboost, '-lboost_filesystem'), ' -lstdc++fs', ' -lcrypt', ' -lcryptopp', maybe_static(args.staticboost, '-lboost_date_time'), ]) @@ -1097,8 +1081,8 @@ if not args.staticboost: for pkg in pkgs: args.user_cflags += ' ' + pkg_config(pkg, '--cflags') libs += ' ' + pkg_config(pkg, '--libs') -user_cflags = args.user_cflags -user_ldflags = args.user_ldflags +user_cflags = args.user_cflags + ' -fvisibility=hidden' +user_ldflags = args.user_ldflags + ' -fvisibility=hidden' if args.staticcxx: user_ldflags += " -static-libgcc -static-libstdc++" if args.staticthrift: @@ -1155,14 +1139,16 @@ with open(buildfile, 'w') as f: ''').format(**globals())) for mode in build_modes: modeval = modes[mode] + fmt_lib = 'libfmtd.a' if mode == 'debug' else 'libfmt.a' f.write(textwrap.dedent('''\ - cxxflags_{mode} = {opt} -DXXH_PRIVATE_API -I. -I $builddir/{mode}/gen + cxxflags_{mode} = {opt} -DXXH_PRIVATE_API -DSEASTAR_TESTING_MAIN -I. -I $builddir/{mode}/gen + libs_{mode} = seastar/build/{mode}/_cooking/installed/lib/{fmt_lib} rule cxx.{mode} - command = $cxx -MD -MT $out -MF $out.d {seastar_cflags} $cxxflags $cxxflags_{mode} $obj_cxxflags -c -o $out $in + command = $cxx -MD -MT $out -MF $out.d {sanitize} {seastar_cflags} $cxxflags $cxxflags_{mode} $obj_cxxflags -c -o $out $in description = CXX $out depfile = $out.d rule link.{mode} - command = $cxx $cxxflags_{mode} {sanitize_libs} $ldflags -o $out $in $libs $libs_{mode} {seastar_libs} + command = $cxx $cxxflags_{mode} {sanitize} {sanitize_libs} $ldflags -o $out $in $libs $libs_{mode} {seastar_libs} description = LINK $out pool = link_pool rule link_stripped.{mode} @@ -1188,7 +1174,7 @@ with open(buildfile, 'w') as f: s/exceptions::syntax_exception e/exceptions::syntax_exception\& e/' $ build/{mode}/gen/${{stem}}Parser.cpp description = ANTLR3 $in - ''').format(mode=mode, antlr3_exec=antlr3_exec, **modeval)) + ''').format(mode=mode, antlr3_exec=antlr3_exec, fmt_lib=fmt_lib, **modeval)) f.write( 'build {mode}: phony {artifacts}\n'.format( mode=mode, @@ -1224,8 +1210,11 @@ with open(buildfile, 'w') as f: objs.append('$builddir/' + mode + '/gen/utils/gz/crc_combine_table.o') if binary.startswith('tests/'): local_libs = '$libs' - if binary not in tests_not_using_seastar_test_framework or binary in pure_boost_tests: + if binary in pure_boost_tests: local_libs += ' ' + maybe_static(args.staticboost, '-lboost_unit_test_framework') + if binary not in tests_not_using_seastar_test_framework: + pc_path = os.path.join('seastar', pc[mode].replace('seastar.pc', 'seastar-testing.pc')) + local_libs += ' ' + pkg_config(pc_path, '--libs', '--static') if has_thrift: local_libs += ' ' + thrift_libs + ' ' + maybe_static(args.staticboost, '-lboost_system') # Our code's debugging information is huge, and multiplied @@ -1307,8 +1296,8 @@ with open(buildfile, 'w') as f: f.write('build seastar/build/{mode}/libseastar.a seastar/build/{mode}/apps/iotune/iotune: ninja | always\n' .format(**locals())) f.write(' pool = seastar_pool\n') - f.write(' subdir = seastar\n') - f.write(' target = build/{mode}/libseastar.a build/{mode}/apps/iotune/iotune\n'.format(**locals())) + f.write(' subdir = seastar/build/{mode}\n'.format(**locals())) + f.write(' target = seastar seastar_testing app_iotune\n'.format(**locals())) f.write(textwrap.dedent('''\ build build/{mode}/iotune: copy seastar/build/{mode}/apps/iotune/iotune ''').format(**locals())) diff --git a/gms/inet_address.hh b/gms/inet_address.hh index 9269af83a3..e09f432c1a 100644 --- a/gms/inet_address.hh +++ b/gms/inet_address.hh @@ -21,6 +21,7 @@ #pragma once +#include #include #include "utils/serialization.hh" #include diff --git a/lister.cc b/lister.cc index 98fd591843..5ed74edc6f 100644 --- a/lister.cc +++ b/lister.cc @@ -1,3 +1,4 @@ +#include #include #include #include "lister.hh" diff --git a/seastar b/seastar index 7d620e1326..07e1ed32ad 160000 --- a/seastar +++ b/seastar @@ -1 +1 @@ -Subproject commit 7d620e1326716c1019a83bb28d9d3fb3590edba0 +Subproject commit 07e1ed32ad079692e26d38985a7de20574e066e7 diff --git a/sstables/integrity_checked_file_impl.cc b/sstables/integrity_checked_file_impl.cc index 4488b7d8e6..babcc78084 100644 --- a/sstables/integrity_checked_file_impl.cc +++ b/sstables/integrity_checked_file_impl.cc @@ -20,6 +20,7 @@ */ #include "integrity_checked_file_impl.hh" +#include #include namespace sstables { diff --git a/tests/aggregate_fcts_test.cc b/tests/aggregate_fcts_test.cc index 73dbe86e8d..2d88cf38c3 100644 --- a/tests/aggregate_fcts_test.cc +++ b/tests/aggregate_fcts_test.cc @@ -29,7 +29,7 @@ #include "utils/big_decimal.hh" #include "exceptions/exceptions.hh" -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/auth_test.cc b/tests/auth_test.cc index 6a881db851..a73e8e5b42 100644 --- a/tests/auth_test.cc +++ b/tests/auth_test.cc @@ -30,7 +30,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/batchlog_manager_test.cc b/tests/batchlog_manager_test.cc index 09fdf9199d..e03e52eb3f 100644 --- a/tests/batchlog_manager_test.cc +++ b/tests/batchlog_manager_test.cc @@ -26,7 +26,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/broken_sstable_test.cc b/tests/broken_sstable_test.cc index 6bfca99c4e..de37a38f26 100644 --- a/tests/broken_sstable_test.cc +++ b/tests/broken_sstable_test.cc @@ -19,7 +19,8 @@ * along with Scylla. If not, see . */ -#include "tests/test-utils.hh" +#include +#include #include "sstable_test.hh" using namespace sstables; diff --git a/tests/cache_flat_mutation_reader_test.cc b/tests/cache_flat_mutation_reader_test.cc index 2d43e6d125..1a9aea2ccb 100644 --- a/tests/cache_flat_mutation_reader_test.cc +++ b/tests/cache_flat_mutation_reader_test.cc @@ -23,7 +23,7 @@ #include -#include "tests/test-utils.hh" +#include #include #include "schema_builder.hh" #include "keys.hh" diff --git a/tests/canonical_mutation_test.cc b/tests/canonical_mutation_test.cc index 654e790add..4e5b3257be 100644 --- a/tests/canonical_mutation_test.cc +++ b/tests/canonical_mutation_test.cc @@ -27,7 +27,7 @@ #include "mutation_assertions.hh" #include "tests/test_services.hh" -#include "tests/test-utils.hh" +#include #include diff --git a/tests/castas_fcts_test.cc b/tests/castas_fcts_test.cc index af6b97db36..dc8a6dcf97 100644 --- a/tests/castas_fcts_test.cc +++ b/tests/castas_fcts_test.cc @@ -28,7 +28,7 @@ #include "utils/big_decimal.hh" #include "exceptions/exceptions.hh" -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/cell_locker_test.cc b/tests/cell_locker_test.cc index d525418412..625948e728 100644 --- a/tests/cell_locker_test.cc +++ b/tests/cell_locker_test.cc @@ -19,7 +19,7 @@ * along with Scylla. If not, see . */ -#include "tests/test-utils.hh" +#include #include diff --git a/tests/clustering_ranges_walker_test.cc b/tests/clustering_ranges_walker_test.cc index 68639245c4..ba72ad2638 100644 --- a/tests/clustering_ranges_walker_test.cc +++ b/tests/clustering_ranges_walker_test.cc @@ -21,7 +21,7 @@ #include -#include "tests/test-utils.hh" +#include #include "simple_schema.hh" #include "clustering_ranges_walker.hh" diff --git a/tests/commitlog_test.cc b/tests/commitlog_test.cc index 3a2fbdb1ec..b8e60134d6 100644 --- a/tests/commitlog_test.cc +++ b/tests/commitlog_test.cc @@ -29,7 +29,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include #include #include diff --git a/tests/config_test.cc b/tests/config_test.cc index 7a7f955975..b477788f37 100644 --- a/tests/config_test.cc +++ b/tests/config_test.cc @@ -24,7 +24,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include #include "db/config.hh" diff --git a/tests/continuous_data_consumer_test.cc b/tests/continuous_data_consumer_test.cc index 305c83b8c5..33f8069f56 100644 --- a/tests/continuous_data_consumer_test.cc +++ b/tests/continuous_data_consumer_test.cc @@ -29,7 +29,8 @@ #include #include #include -#include +#include +#include #include namespace { diff --git a/tests/counter_test.cc b/tests/counter_test.cc index cf90e4916e..7d49d83730 100644 --- a/tests/counter_test.cc +++ b/tests/counter_test.cc @@ -27,7 +27,7 @@ #include -#include "tests/test-utils.hh" +#include #include "tests/test_services.hh" #include "schema_builder.hh" #include "keys.hh" diff --git a/tests/cql_auth_query_test.cc b/tests/cql_auth_query_test.cc index 323c240ded..1f86746c8f 100644 --- a/tests/cql_auth_query_test.cc +++ b/tests/cql_auth_query_test.cc @@ -39,7 +39,7 @@ #include "seastarx.hh" #include "service/client_state.hh" #include "tests/cql_test_env.hh" -#include "tests/test-utils.hh" +#include static const auto alice = std::string_view("alice"); static const auto bob = std::string_view("bob"); diff --git a/tests/cql_query_test.cc b/tests/cql_query_test.cc index bc14930b0d..18e9562238 100644 --- a/tests/cql_query_test.cc +++ b/tests/cql_query_test.cc @@ -29,7 +29,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/data_listeners_test.cc b/tests/data_listeners_test.cc index 57a9873144..3d4d102afc 100755 --- a/tests/data_listeners_test.cc +++ b/tests/data_listeners_test.cc @@ -21,7 +21,7 @@ #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" #include "cql3/query_processor.hh" diff --git a/tests/database_test.cc b/tests/database_test.cc index 6fbcaab78c..a26a082d9c 100644 --- a/tests/database_test.cc +++ b/tests/database_test.cc @@ -22,7 +22,8 @@ #include #include -#include +#include +#include #include "tests/cql_test_env.hh" #include "tests/result_set_assertions.hh" diff --git a/tests/ec2_snitch_test.cc b/tests/ec2_snitch_test.cc index 55ee064d1f..298dcbed49 100644 --- a/tests/ec2_snitch_test.cc +++ b/tests/ec2_snitch_test.cc @@ -23,7 +23,7 @@ #include #include "locator/ec2_snitch.hh" #include "utils/fb_utilities.hh" -#include "tests/test-utils.hh" +#include #include #include #include diff --git a/tests/extensions_test.cc b/tests/extensions_test.cc index c984961f6d..575d24d2eb 100644 --- a/tests/extensions_test.cc +++ b/tests/extensions_test.cc @@ -25,7 +25,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/filtering_test.cc b/tests/filtering_test.cc index ca3764bf63..3e7609cf66 100644 --- a/tests/filtering_test.cc +++ b/tests/filtering_test.cc @@ -28,7 +28,7 @@ #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/flat_mutation_reader_test.cc b/tests/flat_mutation_reader_test.cc index b98c5895fb..d0379f5097 100644 --- a/tests/flat_mutation_reader_test.cc +++ b/tests/flat_mutation_reader_test.cc @@ -21,7 +21,8 @@ #include -#include +#include +#include #include "mutation.hh" #include "mutation_fragment.hh" diff --git a/tests/flush_queue_test.cc b/tests/flush_queue_test.cc index bab48af3bc..0326c80a8c 100644 --- a/tests/flush_queue_test.cc +++ b/tests/flush_queue_test.cc @@ -29,7 +29,8 @@ #include #include "seastarx.hh" -#include "tests/test-utils.hh" +#include +#include #include "utils/flush_queue.hh" #include "log.hh" diff --git a/tests/fragmented_temporary_buffer_test.cc b/tests/fragmented_temporary_buffer_test.cc index 7ff544f7d3..4e52f63f48 100644 --- a/tests/fragmented_temporary_buffer_test.cc +++ b/tests/fragmented_temporary_buffer_test.cc @@ -20,7 +20,7 @@ */ #include -#include +#include #include "utils/fragmented_temporary_buffer.hh" diff --git a/tests/frozen_mutation_test.cc b/tests/frozen_mutation_test.cc index 78076b7286..23ad5feb6f 100644 --- a/tests/frozen_mutation_test.cc +++ b/tests/frozen_mutation_test.cc @@ -23,7 +23,8 @@ #include #include "tests/test_services.hh" -#include "tests/test-utils.hh" +#include +#include #include "frozen_mutation.hh" #include "schema_builder.hh" diff --git a/tests/gce_snitch_test.cc b/tests/gce_snitch_test.cc index 723d738e03..f8e459eed9 100644 --- a/tests/gce_snitch_test.cc +++ b/tests/gce_snitch_test.cc @@ -35,7 +35,7 @@ #include #include "locator/gce_snitch.hh" #include "utils/fb_utilities.hh" -#include "tests/test-utils.hh" +#include #include #include diff --git a/tests/gossip_test.cc b/tests/gossip_test.cc index 877935e3ce..f5714bf30e 100644 --- a/tests/gossip_test.cc +++ b/tests/gossip_test.cc @@ -25,7 +25,7 @@ #include -#include "tests/test-utils.hh" +#include #include "message/messaging_service.hh" #include "gms/failure_detector.hh" #include "gms/gossiper.hh" diff --git a/tests/gossiping_property_file_snitch_test.cc b/tests/gossiping_property_file_snitch_test.cc index a6eaedbb5b..a5aae90d7a 100644 --- a/tests/gossiping_property_file_snitch_test.cc +++ b/tests/gossiping_property_file_snitch_test.cc @@ -22,7 +22,7 @@ #include #include "locator/gossiping_property_file_snitch.hh" -#include "tests/test-utils.hh" +#include #include #include #include diff --git a/tests/hash_test.cc b/tests/hash_test.cc index 4f6499a07a..2e3bd1de20 100644 --- a/tests/hash_test.cc +++ b/tests/hash_test.cc @@ -24,7 +24,7 @@ #include #include "seastarx.hh" -#include "tests/test-utils.hh" +#include #include "utils/hash.hh" SEASTAR_TEST_CASE(test_pair_hash){ diff --git a/tests/hint_test.cc b/tests/hint_test.cc index 9e0d938d53..adbb4f7ece 100644 --- a/tests/hint_test.cc +++ b/tests/hint_test.cc @@ -28,7 +28,7 @@ #include #include "tests/test_services.hh" -#include "tests/test-utils.hh" +#include #include "tests/mutation_source_test.hh" #include "tests/mutation_assertions.hh" diff --git a/tests/idl_test.cc b/tests/idl_test.cc index 319019df6c..a8eae97c5d 100644 --- a/tests/idl_test.cc +++ b/tests/idl_test.cc @@ -25,8 +25,6 @@ #include -#include "tests/test-utils.hh" - #include #include #include diff --git a/tests/json_cql_query_test.cc b/tests/json_cql_query_test.cc index 130a25bb17..6e4f8570a8 100644 --- a/tests/json_cql_query_test.cc +++ b/tests/json_cql_query_test.cc @@ -28,7 +28,7 @@ #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/json_test.cc b/tests/json_test.cc index 3bb1fb035f..417176dab0 100644 --- a/tests/json_test.cc +++ b/tests/json_test.cc @@ -26,7 +26,6 @@ #include -#include "tests/test-utils.hh" #include "json.hh" using namespace seastar; diff --git a/tests/limiting_data_source_test.cc b/tests/limiting_data_source_test.cc index 0a0889e01b..8ab8c46948 100644 --- a/tests/limiting_data_source_test.cc +++ b/tests/limiting_data_source_test.cc @@ -22,7 +22,8 @@ #include "utils/limiting_data_source.hh" #include -#include +#include +#include #include #include #include @@ -122,4 +123,4 @@ SEASTAR_THREAD_TEST_CASE(test_skip_bigger_than_buffered_data) { auto buf = tested.skip(10).get0(); BOOST_REQUIRE_EQUAL(1, buf.size()); BOOST_REQUIRE_EQUAL(11, buf[0]); -} \ No newline at end of file +} diff --git a/tests/loading_cache_test.cc b/tests/loading_cache_test.cc index 0377f58a5d..b2132128ab 100644 --- a/tests/loading_cache_test.cc +++ b/tests/loading_cache_test.cc @@ -33,7 +33,8 @@ #include "seastarx.hh" #include "tests/eventually.hh" -#include "tests/test-utils.hh" +#include +#include #include "tmpdir.hh" #include "log.hh" diff --git a/tests/logalloc_test.cc b/tests/logalloc_test.cc index 011a7f2404..2f457ee4ac 100644 --- a/tests/logalloc_test.cc +++ b/tests/logalloc_test.cc @@ -26,10 +26,12 @@ #include #include +#include #include #include #include -#include +#include +#include #include #include #include "utils/phased_barrier.hh" diff --git a/tests/memtable_test.cc b/tests/memtable_test.cc index d046d8172f..9a99c05cc1 100644 --- a/tests/memtable_test.cc +++ b/tests/memtable_test.cc @@ -24,7 +24,7 @@ #include "service/priority_manager.hh" #include "database.hh" #include "utils/UUID_gen.hh" -#include "tests/test-utils.hh" +#include #include "schema_builder.hh" #include diff --git a/tests/multishard_mutation_query_test.cc b/tests/multishard_mutation_query_test.cc index 717c561645..dae9f7b97c 100644 --- a/tests/multishard_mutation_query_test.cc +++ b/tests/multishard_mutation_query_test.cc @@ -26,7 +26,7 @@ #include "tests/cql_assertions.hh" #include "tests/mutation_assertions.hh" -#include +#include #include diff --git a/tests/multishard_writer_test.cc b/tests/multishard_writer_test.cc index fd6bc38789..0114021591 100644 --- a/tests/multishard_writer_test.cc +++ b/tests/multishard_writer_test.cc @@ -21,7 +21,7 @@ #include -#include +#include #include #include "mutation_fragment.hh" diff --git a/tests/mutation_fragment_test.cc b/tests/mutation_fragment_test.cc index 280273e35b..f2faff70fe 100644 --- a/tests/mutation_fragment_test.cc +++ b/tests/mutation_fragment_test.cc @@ -21,7 +21,7 @@ #include -#include +#include #include "mutation_source_test.hh" #include "mutation_fragment.hh" diff --git a/tests/mutation_query_test.cc b/tests/mutation_query_test.cc index 6f345ecd56..82a01c6552 100644 --- a/tests/mutation_query_test.cc +++ b/tests/mutation_query_test.cc @@ -29,7 +29,8 @@ #include #include "tests/test_services.hh" -#include "tests/test-utils.hh" +#include +#include #include "tests/mutation_assertions.hh" #include "tests/result_set_assertions.hh" #include "tests/mutation_source_test.hh" diff --git a/tests/mutation_reader_test.cc b/tests/mutation_reader_test.cc index 90745c0287..4558fafda4 100644 --- a/tests/mutation_reader_test.cc +++ b/tests/mutation_reader_test.cc @@ -22,7 +22,6 @@ #include -#include #include #include @@ -30,7 +29,8 @@ #include #include -#include "tests/test-utils.hh" +#include +#include #include "tests/mutation_assertions.hh" #include "tests/flat_mutation_reader_assertions.hh" #include "tests/tmpdir.hh" diff --git a/tests/mutation_test.cc b/tests/mutation_test.cc index 2f0412750b..f6469a9200 100644 --- a/tests/mutation_test.cc +++ b/tests/mutation_test.cc @@ -43,7 +43,8 @@ #include "tmpdir.hh" #include "sstables/compaction_manager.hh" -#include "tests/test-utils.hh" +#include +#include #include "tests/mutation_assertions.hh" #include "tests/result_set_assertions.hh" #include "tests/test_services.hh" diff --git a/tests/mvcc_test.cc b/tests/mvcc_test.cc index a937c756fc..a8b48ab71a 100644 --- a/tests/mvcc_test.cc +++ b/tests/mvcc_test.cc @@ -31,7 +31,7 @@ #include "partition_snapshot_row_cursor.hh" #include "partition_snapshot_reader.hh" -#include "tests/test-utils.hh" +#include #include "tests/mutation_assertions.hh" #include "tests/simple_schema.hh" #include "tests/mutation_source_test.hh" diff --git a/tests/network_topology_strategy_test.cc b/tests/network_topology_strategy_test.cc index 7a210a1841..c4bd9989df 100644 --- a/tests/network_topology_strategy_test.cc +++ b/tests/network_topology_strategy_test.cc @@ -25,7 +25,7 @@ #include "utils/sequenced_set.hh" #include "dht/murmur3_partitioner.hh" #include "locator/network_topology_strategy.hh" -#include "tests/test-utils.hh" +#include #include #include "log.hh" #include diff --git a/tests/querier_cache.cc b/tests/querier_cache.cc index eb3235ec21..d5430daa4d 100644 --- a/tests/querier_cache.cc +++ b/tests/querier_cache.cc @@ -27,7 +27,7 @@ #include #include -#include +#include using namespace std::chrono_literals; diff --git a/tests/query_processor_test.cc b/tests/query_processor_test.cc index 84a2361e0d..b3958d9e52 100644 --- a/tests/query_processor_test.cc +++ b/tests/query_processor_test.cc @@ -26,7 +26,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/role_manager_test.cc b/tests/role_manager_test.cc index 19d9bf1e2e..ebd0ba6edb 100644 --- a/tests/role_manager_test.cc +++ b/tests/role_manager_test.cc @@ -21,7 +21,7 @@ #include "auth/standard_role_manager.hh" -#include +#include #include "service/migration_manager.hh" #include "tests/cql_test_env.hh" diff --git a/tests/row_cache_test.cc b/tests/row_cache_test.cc index 9c99372fa2..688ebd9494 100644 --- a/tests/row_cache_test.cc +++ b/tests/row_cache_test.cc @@ -26,7 +26,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include "tests/mutation_assertions.hh" #include "tests/flat_mutation_reader_assertions.hh" #include "tests/mutation_source_test.hh" diff --git a/tests/row_locker_test.cc b/tests/row_locker_test.cc index d0c9092fe8..561f46016d 100644 --- a/tests/row_locker_test.cc +++ b/tests/row_locker_test.cc @@ -19,7 +19,7 @@ * along with Scylla. If not, see . */ -#include "tests/test-utils.hh" +#include #include diff --git a/tests/schema_change_test.cc b/tests/schema_change_test.cc index a1231bc893..2064e40683 100644 --- a/tests/schema_change_test.cc +++ b/tests/schema_change_test.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "tests/cql_test_env.hh" diff --git a/tests/schema_registry_test.cc b/tests/schema_registry_test.cc index e6740a0782..7a370382f6 100644 --- a/tests/schema_registry_test.cc +++ b/tests/schema_registry_test.cc @@ -23,7 +23,7 @@ #include #include "tests/test_services.hh" -#include "tests/test-utils.hh" +#include #include "schema_registry.hh" #include "schema_builder.hh" #include "mutation_source_test.hh" diff --git a/tests/secondary_index_test.cc b/tests/secondary_index_test.cc index 7f76b0cc35..a78595a56d 100644 --- a/tests/secondary_index_test.cc +++ b/tests/secondary_index_test.cc @@ -19,7 +19,7 @@ * along with Scylla. If not, see . */ -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" #include "transport/messages/result_message.hh" diff --git a/tests/serialized_action_test.cc b/tests/serialized_action_test.cc index f09cc83ff2..bf557032b2 100644 --- a/tests/serialized_action_test.cc +++ b/tests/serialized_action_test.cc @@ -23,7 +23,7 @@ #include #include #include "utils/serialized_action.hh" -#include "tests/test-utils.hh" +#include #include "utils/phased_barrier.hh" SEASTAR_TEST_CASE(test_serialized_action_triggering) { diff --git a/tests/snitch_reset_test.cc b/tests/snitch_reset_test.cc index 7b27ffd4bf..f0ec6c50fc 100644 --- a/tests/snitch_reset_test.cc +++ b/tests/snitch_reset_test.cc @@ -22,7 +22,7 @@ #include #include "locator/gossiping_property_file_snitch.hh" -#include "tests/test-utils.hh" +#include #include #include #include diff --git a/tests/sstable_3_x_test.cc b/tests/sstable_3_x_test.cc index 8007310434..78d75f8e8b 100644 --- a/tests/sstable_3_x_test.cc +++ b/tests/sstable_3_x_test.cc @@ -26,7 +26,8 @@ #include #include -#include +#include +#include #include "sstables/sstables.hh" #include "sstables/compaction_manager.hh" diff --git a/tests/sstable_datafile_test.cc b/tests/sstable_datafile_test.cc index 635f5a9bed..13b61dd5ad 100644 --- a/tests/sstable_datafile_test.cc +++ b/tests/sstable_datafile_test.cc @@ -26,7 +26,7 @@ #include "sstables/key.hh" #include "sstables/compress.hh" #include "sstables/compaction.hh" -#include "tests/test-utils.hh" +#include #include "schema.hh" #include "schema_builder.hh" #include "database.hh" diff --git a/tests/sstable_mutation_test.cc b/tests/sstable_mutation_test.cc index 9a1c75c785..0e07e0401c 100644 --- a/tests/sstable_mutation_test.cc +++ b/tests/sstable_mutation_test.cc @@ -22,7 +22,8 @@ #include #include -#include "tests/test-utils.hh" +#include +#include #include "sstable_test.hh" #include "sstables/key.hh" #include diff --git a/tests/sstable_resharding_test.cc b/tests/sstable_resharding_test.cc index 553efec574..c44846d72c 100644 --- a/tests/sstable_resharding_test.cc +++ b/tests/sstable_resharding_test.cc @@ -7,7 +7,7 @@ #include #include #include "sstables/sstables.hh" -#include "tests/test-utils.hh" +#include #include "schema.hh" #include "database.hh" #include "sstables/compaction_manager.hh" diff --git a/tests/sstable_test.cc b/tests/sstable_test.cc index de645dcfd6..446678b423 100644 --- a/tests/sstable_test.cc +++ b/tests/sstable_test.cc @@ -19,9 +19,6 @@ * along with Scylla. If not, see . */ - -#include - #include #include #include @@ -31,7 +28,7 @@ #include "sstables/compaction_manager.hh" #include "sstables/key.hh" #include "sstable_utils.hh" -#include "tests/test-utils.hh" +#include #include "schema.hh" #include "compress.hh" #include "database.hh" diff --git a/tests/storage_proxy_test.cc b/tests/storage_proxy_test.cc index 2de7a61f29..a7216c2f94 100644 --- a/tests/storage_proxy_test.cc +++ b/tests/storage_proxy_test.cc @@ -21,7 +21,7 @@ #include -#include +#include #include "query-result-writer.hh" #include "tests/cql_test_env.hh" diff --git a/tests/transport_test.cc b/tests/transport_test.cc index 4a07faae6e..6a26d26655 100644 --- a/tests/transport_test.cc +++ b/tests/transport_test.cc @@ -19,7 +19,7 @@ * along with Scylla. If not, see . */ -#include +#include #include "transport/request.hh" #include "transport/response.hh" diff --git a/tests/types_test.cc b/tests/types_test.cc index 2ab10dc483..a964713be9 100644 --- a/tests/types_test.cc +++ b/tests/types_test.cc @@ -19,7 +19,7 @@ * along with Scylla. If not, see . */ -#include +#include #include #include #include diff --git a/tests/view_build_test.cc b/tests/view_build_test.cc index a02635ed8c..dd209f7aa3 100644 --- a/tests/view_build_test.cc +++ b/tests/view_build_test.cc @@ -25,7 +25,7 @@ #include "db/view/view_builder.hh" #include "db/system_keyspace.hh" -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" #include "schema_builder.hh" diff --git a/tests/view_complex_test.cc b/tests/view_complex_test.cc index 21c1bd60d9..26a6260bbc 100644 --- a/tests/view_complex_test.cc +++ b/tests/view_complex_test.cc @@ -26,7 +26,7 @@ #include "db/view/view_builder.hh" #include "sstables/compaction_manager.hh" -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/view_schema_test.cc b/tests/view_schema_test.cc index daae8da0e5..d2b5a4f13d 100644 --- a/tests/view_schema_test.cc +++ b/tests/view_schema_test.cc @@ -28,7 +28,8 @@ #include "db/view/node_view_update_backlog.hh" #include "db/view/view_builder.hh" -#include "tests/test-utils.hh" +#include +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" diff --git a/tests/virtual_reader_test.cc b/tests/virtual_reader_test.cc index 57d80d327c..50e572b83e 100644 --- a/tests/virtual_reader_test.cc +++ b/tests/virtual_reader_test.cc @@ -27,7 +27,7 @@ #include #include -#include "tests/test-utils.hh" +#include #include "tests/cql_test_env.hh" #include "tests/cql_assertions.hh" #include "tests/test_services.hh" diff --git a/tools/toolchain/image b/tools/toolchain/image index 40d5227c2a..67588be870 100644 --- a/tools/toolchain/image +++ b/tools/toolchain/image @@ -1 +1 @@ -docker.io/scylladb/scylla-toolchain:fedora-29-20190123 \ No newline at end of file +docker.io/scylladb/scylla-toolchain:fedora-29-20190127 \ No newline at end of file