From 8dbe22233143f338c10dc6680070c19affd8f244 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Mon, 2 Nov 2020 15:47:58 +0200 Subject: [PATCH] raft: compile raft by default --- configure.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/configure.py b/configure.py index f3330c0f36..6643b14ffa 100755 --- a/configure.py +++ b/configure.py @@ -522,8 +522,6 @@ arg_parser.add_argument('--with-antlr3', dest='antlr3_exec', action='store', def help='path to antlr3 executable') arg_parser.add_argument('--with-ragel', dest='ragel_exec', action='store', default='ragel', help='path to ragel executable') -arg_parser.add_argument('--build-raft', dest='build_raft', action='store_true', default=False, - help='build raft code') add_tristate(arg_parser, name='stack-guards', dest='stack_guards', help='Use stack guards') arg_parser.add_argument('--verbose', dest='verbose', action='store_true', help='Make configure.py output more verbose (useful for debugging the build process itself)') @@ -532,10 +530,6 @@ arg_parser.add_argument('--test-repeat', dest='test_repeat', action='store', typ arg_parser.add_argument('--test-timeout', dest='test_timeout', action='store', type=str, default='7200') args = arg_parser.parse_args() -if not args.build_raft: - all_artifacts.difference_update(raft_tests) - tests.difference_update(raft_tests) - defines = ['XXH_PRIVATE_API', 'SEASTAR_TESTING_MAIN', ] @@ -1499,9 +1493,6 @@ libs = ' '.join([maybe_static(args.staticyamlcpp, '-lyaml-cpp'), '-latomic', '-l if not args.staticboost: args.user_cflags += ' -DBOOST_TEST_DYN_LINK' -if build_raft: - args.user_cflags += ' -DENABLE_SCYLLA_RAFT' - # thrift version detection, see #4538 proc_res = subprocess.run(["thrift", "-version"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) proc_res_output = proc_res.stdout.decode("utf-8")