Switch to the the CMake-ified Seastar
Committer: Avi Kivity <avi@scylladb.com> Branch: next Switch to the the CMake-ified Seastar This change allows Scylla to be compiled against the `master` branch of Seastar. The necessary changes: - Add `-Wno-error` to prevent a Seastar warning from terminating the build - The new Seastar build system generates the pkg-config files (for example, `seastar.pc`) at configure time, so we don't need to invoke Ninja to generate them - The `-march` argument is no longer inherited from Seastar (correctly), so it needs to be provided independently - Define `SEASTAR_TESTING_MAIN` so that the definition of an entry point is included for all unit test compilation units - Independently link Scylla against Seastar's compiled copy of fmt in its build directory - All test files use the (now public) Seastar testing headers - Add some missing Seastar headers to source files [avi: regenerate frozen toolchain, adjust seastar submoule] Signed-off-by: Jesse Haber-Kucharsky <jhaberku@scylladb.com> Message-Id: <02141f2e1ecff5cbcd56b32768356c3bf62750c4.1548820547.git.jhaberku@scylladb.com>
This commit is contained in:
Jesse Haber-Kucharsky
committed by
Avi Kivity
Avi Kivity
parent
9dd3c59c77
commit
b39eac653d
2
.gitmodules
vendored
2
.gitmodules
vendored
@@ -1,6 +1,6 @@
|
||||
[submodule "seastar"]
|
||||
path = seastar
|
||||
url = ../scylla-seastar
|
||||
url = ../seastar
|
||||
ignore = dirty
|
||||
[submodule "swagger-ui"]
|
||||
path = swagger-ui
|
||||
|
||||
61
configure.py
61
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()))
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/net/ip.hh>
|
||||
#include "utils/serialization.hh"
|
||||
#include <sstream>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/reactor.hh>
|
||||
#include <seastar/util/log.hh>
|
||||
#include "lister.hh"
|
||||
|
||||
2
seastar
2
seastar
Submodule seastar updated: 7d620e1326...07e1ed32ad
@@ -20,6 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "integrity_checked_file_impl.hh"
|
||||
#include <seastar/core/print.hh>
|
||||
#include <boost/algorithm/cxx11/all_of.hpp>
|
||||
|
||||
namespace sstables {
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
#include "utils/big_decimal.hh"
|
||||
#include "exceptions/exceptions.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <seastar/core/shared_ptr.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -19,7 +19,8 @@
|
||||
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include "sstable_test.hh"
|
||||
|
||||
using namespace sstables;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include "schema_builder.hh"
|
||||
#include "keys.hh"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "mutation_assertions.hh"
|
||||
|
||||
#include "tests/test_services.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include "utils/big_decimal.hh"
|
||||
#include "exceptions/exceptions.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
|
||||
#include "simple_schema.hh"
|
||||
#include "clustering_ranges_walker.hh"
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <unordered_set>
|
||||
#include <set>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/core/future-util.hh>
|
||||
#include <seastar/core/do_with.hh>
|
||||
#include <seastar/core/scollectd_api.hh>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <iostream>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/core/future-util.hh>
|
||||
#include "db/config.hh"
|
||||
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
#include <seastar/core/iostream.hh>
|
||||
#include <seastar/core/temporary_buffer.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include <random>
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include <boost/range/algorithm/sort.hpp>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/test_services.hh"
|
||||
#include "schema_builder.hh"
|
||||
#include "keys.hh"
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "seastarx.hh"
|
||||
#include "service/client_state.hh"
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
|
||||
static const auto alice = std::string_view("alice");
|
||||
static const auto bob = std::string_view("bob");
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <seastar/net/inet_address.hh>
|
||||
#include <seastar/core/metrics_api.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
#include "cql3/query_processor.hh"
|
||||
|
||||
@@ -22,7 +22,8 @@
|
||||
|
||||
#include <seastar/core/reactor.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/result_set_assertions.hh"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "locator/ec2_snitch.hh"
|
||||
#include "utils/fb_utilities.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <seastar/core/future-util.hh>
|
||||
#include <seastar/core/sleep.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include <seastar/net/inet_address.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -21,7 +21,8 @@
|
||||
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
#include "mutation.hh"
|
||||
#include "mutation_fragment.hh"
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
#include "seastarx.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/core/print.hh>
|
||||
#include "utils/flush_queue.hh"
|
||||
#include "log.hh"
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
#include "utils/fragmented_temporary_buffer.hh"
|
||||
|
||||
|
||||
@@ -23,7 +23,8 @@
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#include "tests/test_services.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
#include "frozen_mutation.hh"
|
||||
#include "schema_builder.hh"
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "locator/gce_snitch.hh"
|
||||
#include "utils/fb_utilities.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/http/httpd.hh>
|
||||
#include <seastar/net/inet_address.hh>
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include <seastar/util/defer.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "message/messaging_service.hh"
|
||||
#include "gms/failure_detector.hh"
|
||||
#include "gms/gossiper.hh"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "locator/gossiping_property_file_snitch.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <seastar/core/future.hh>
|
||||
|
||||
#include "seastarx.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "utils/hash.hh"
|
||||
|
||||
SEASTAR_TEST_CASE(test_pair_hash){
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <unordered_set>
|
||||
|
||||
#include "tests/test_services.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
|
||||
#include "tests/mutation_source_test.hh"
|
||||
#include "tests/mutation_assertions.hh"
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
|
||||
#include <seastar/util/variant_utils.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <optional>
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include <seastar/net/inet_address.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
|
||||
#include <seastar/core/sstring.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include "json.hh"
|
||||
|
||||
using namespace seastar;
|
||||
|
||||
@@ -22,7 +22,8 @@
|
||||
#include "utils/limiting_data_source.hh"
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include <seastar/core/iostream.hh>
|
||||
#include <seastar/core/temporary_buffer.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
@@ -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]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,7 +33,8 @@
|
||||
|
||||
#include "seastarx.hh"
|
||||
#include "tests/eventually.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include "tmpdir.hh"
|
||||
#include "log.hh"
|
||||
|
||||
|
||||
@@ -26,10 +26,12 @@
|
||||
#include <chrono>
|
||||
#include <random>
|
||||
|
||||
#include <seastar/core/print.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/core/timer.hh>
|
||||
#include <seastar/core/sleep.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include <seastar/util/defer.hh>
|
||||
#include <deque>
|
||||
#include "utils/phased_barrier.hh"
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include "service/priority_manager.hh"
|
||||
#include "database.hh"
|
||||
#include "utils/UUID_gen.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "schema_builder.hh"
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "tests/cql_assertions.hh"
|
||||
#include "tests/mutation_assertions.hh"
|
||||
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
#include <experimental/source_location>
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/util/bool_class.hh>
|
||||
|
||||
#include "mutation_fragment.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
|
||||
#include "mutation_source_test.hh"
|
||||
#include "mutation_fragment.hh"
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
#include <query-result-writer.hh>
|
||||
|
||||
#include "tests/test_services.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include "tests/mutation_assertions.hh"
|
||||
#include "tests/result_set_assertions.hh"
|
||||
#include "tests/mutation_source_test.hh"
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
|
||||
#include <random>
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include <boost/range/irange.hpp>
|
||||
#include <boost/range/adaptor/uniqued.hpp>
|
||||
|
||||
@@ -30,7 +29,8 @@
|
||||
#include <seastar/core/do_with.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include "tests/mutation_assertions.hh"
|
||||
#include "tests/flat_mutation_reader_assertions.hh"
|
||||
#include "tests/tmpdir.hh"
|
||||
|
||||
@@ -43,7 +43,8 @@
|
||||
#include "tmpdir.hh"
|
||||
#include "sstables/compaction_manager.hh"
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include "tests/mutation_assertions.hh"
|
||||
#include "tests/result_set_assertions.hh"
|
||||
#include "tests/test_services.hh"
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "partition_snapshot_row_cursor.hh"
|
||||
#include "partition_snapshot_reader.hh"
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/mutation_assertions.hh"
|
||||
#include "tests/simple_schema.hh"
|
||||
#include "tests/mutation_source_test.hh"
|
||||
|
||||
@@ -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 <seastar/testing/test_case.hh>
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include "log.hh"
|
||||
#include <vector>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include <seastar/core/sleep.hh>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "auth/standard_role_manager.hh"
|
||||
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
|
||||
#include "service/migration_manager.hh"
|
||||
#include "tests/cql_test_env.hh"
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <seastar/util/alloc_failure_injector.hh>
|
||||
#include <boost/algorithm/cxx11/any_of.hpp>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/mutation_assertions.hh"
|
||||
#include "tests/flat_mutation_reader_assertions.hh"
|
||||
#include "tests/mutation_source_test.hh"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/util/defer.hh>
|
||||
|
||||
#include "tests/cql_test_env.hh"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <seastar/core/thread.hh>
|
||||
|
||||
#include "tests/test_services.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "schema_registry.hh"
|
||||
#include "schema_builder.hh"
|
||||
#include "mutation_source_test.hh"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
#include "transport/messages/result_message.hh"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/core/semaphore.hh>
|
||||
#include "utils/serialized_action.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "utils/phased_barrier.hh"
|
||||
|
||||
SEASTAR_TEST_CASE(test_serialized_action_triggering) {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "locator/gossiping_property_file_snitch.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
@@ -26,7 +26,8 @@
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
#include "sstables/sstables.hh"
|
||||
#include "sstables/compaction_manager.hh"
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "sstables/key.hh"
|
||||
#include "sstables/compress.hh"
|
||||
#include "sstables/compaction.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "schema.hh"
|
||||
#include "schema_builder.hh"
|
||||
#include "database.hh"
|
||||
|
||||
@@ -22,7 +22,8 @@
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include <seastar/net/inet_address.hh>
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include "sstable_test.hh"
|
||||
#include "sstables/key.hh"
|
||||
#include <seastar/core/do_with.hh>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <seastar/core/do_with.hh>
|
||||
#include <seastar/core/distributed.hh>
|
||||
#include "sstables/sstables.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "schema.hh"
|
||||
#include "database.hh"
|
||||
#include "sstables/compaction_manager.hh"
|
||||
|
||||
@@ -19,9 +19,6 @@
|
||||
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#include <seastar/core/sstring.hh>
|
||||
#include <seastar/core/future-util.hh>
|
||||
#include <seastar/core/align.hh>
|
||||
@@ -31,7 +28,7 @@
|
||||
#include "sstables/compaction_manager.hh"
|
||||
#include "sstables/key.hh"
|
||||
#include "sstable_utils.hh"
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "schema.hh"
|
||||
#include "compress.hh"
|
||||
#include "database.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
|
||||
#include <seastar/core/thread.hh>
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "query-result-writer.hh"
|
||||
|
||||
#include "tests/cql_test_env.hh"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
|
||||
#include "transport/request.hh"
|
||||
#include "transport/response.hh"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <seastar/tests/test-utils.hh>
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/net/inet_address.hh>
|
||||
#include <utils/UUID_gen.hh>
|
||||
#include <boost/asio/ip/address_v4.hpp>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "db/view/view_builder.hh"
|
||||
#include "db/system_keyspace.hh"
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
#include "schema_builder.hh"
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "db/view/view_builder.hh"
|
||||
#include "sstables/compaction_manager.hh"
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -28,7 +28,8 @@
|
||||
#include "db/view/node_view_update_backlog.hh"
|
||||
#include "db/view/view_builder.hh"
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/testing/thread_test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "tests/test-utils.hh"
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include "tests/cql_test_env.hh"
|
||||
#include "tests/cql_assertions.hh"
|
||||
#include "tests/test_services.hh"
|
||||
|
||||
@@ -1 +1 @@
|
||||
docker.io/scylladb/scylla-toolchain:fedora-29-20190123
|
||||
docker.io/scylladb/scylla-toolchain:fedora-29-20190127
|
||||
Reference in New Issue
Block a user