From 703451311f7ed0fc9afca58e73d7e37fe66a4bae Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 8 Dec 2020 15:39:34 +0300 Subject: [PATCH 1/2] configure: Add -DDEVEL to dev build flags To let source code tell debug, dev and release builds from each other. Signed-off-by: Pavel Emelyanov --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 201599d992..35b8828fa8 100755 --- a/configure.py +++ b/configure.py @@ -262,7 +262,7 @@ modes = { 'stack-usage-threshold': 1024*13, }, 'dev': { - 'cxxflags': '-O1 -DSEASTAR_ENABLE_ALLOC_FAILURE_INJECTION -DSCYLLA_ENABLE_ERROR_INJECTION', + 'cxxflags': '-O1 -DDEVEL -DSEASTAR_ENABLE_ALLOC_FAILURE_INJECTION -DSCYLLA_ENABLE_ERROR_INJECTION', 'cxx_ld_flags': '', 'stack-usage-threshold': 1024*21, }, From b837cf25b11370081cc3b03e1ebd7d2621e56887 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 8 Dec 2020 15:41:18 +0300 Subject: [PATCH 2/2] test: Make multishard_mutation_query test do less scans When built by clang this dev-mode test takes ~30 minutes to complete. Let's reduce this time by reducing the scale of the test if DEVEL is set. Signed-off-by: Pavel Emelyanov --- test/boost/multishard_mutation_query_test.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/boost/multishard_mutation_query_test.cc b/test/boost/multishard_mutation_query_test.cc index 80410a558e..ddbb30076d 100644 --- a/test/boost/multishard_mutation_query_test.cc +++ b/test/boost/multishard_mutation_query_test.cc @@ -963,8 +963,10 @@ SEASTAR_THREAD_TEST_CASE(fuzzy_test) { auto pop_desc = create_fuzzy_test_table(env, rnd_engine); -#ifdef DEBUG +#if defined DEBUG auto cfg = fuzzy_test_config{seed, std::chrono::seconds{8}, 1, 1}; +#elif defined DEVEL + auto cfg = fuzzy_test_config{seed, std::chrono::seconds{2}, 8, 4}; #else auto cfg = fuzzy_test_config{seed, std::chrono::seconds{2}, 16, 256}; #endif