diff options
Diffstat (limited to 'vespalib/src')
28 files changed, 44 insertions, 51 deletions
diff --git a/vespalib/src/tests/array/array_test.cpp b/vespalib/src/tests/array/array_test.cpp index 5446130d5d9..75050612357 100644 --- a/vespalib/src/tests/array/array_test.cpp +++ b/vespalib/src/tests/array/array_test.cpp @@ -3,6 +3,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/test/memory_allocator_observer.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/array.hpp> #include <vespa/vespalib/util/round_up_to_page_size.h> #include <vespa/vespalib/util/size_literals.h> @@ -37,7 +38,7 @@ using AllocStats = MyMemoryAllocator::Stats; class Clever { public: Clever() : _counter(&_global) { (*_counter)++; } - Clever(std::atomic<size_t> * counter) : + explicit Clever(std::atomic<size_t> * counter) : _counter(counter) { (*_counter)++; @@ -224,7 +225,7 @@ testBeginEnd(T & v) EXPECT_EQUAL(1u, *(v.begin())); EXPECT_EQUAL(3u, *(v.end() - 1)); - typename T::iterator i(v.begin()); + auto i(v.begin()); EXPECT_EQUAL(1u, *i); EXPECT_EQUAL(2u, *(i+1)); EXPECT_EQUAL(1u, *i++); @@ -249,7 +250,7 @@ testBeginEnd(T & v) EXPECT_EQUAL(3u, *(v.rbegin())); EXPECT_EQUAL(1u, *(v.rend() - 1)); - typename T::reverse_iterator r(v.rbegin()); + auto r(v.rbegin()); EXPECT_EQUAL(3u, *r); EXPECT_EQUAL(2u, *(r+1)); EXPECT_EQUAL(3u, *r++); diff --git a/vespalib/src/tests/arrayqueue/arrayqueue.cpp b/vespalib/src/tests/arrayqueue/arrayqueue.cpp index c00cca17c78..657d379167f 100644 --- a/vespalib/src/tests/arrayqueue/arrayqueue.cpp +++ b/vespalib/src/tests/arrayqueue/arrayqueue.cpp @@ -1,5 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/arrayqueue.hpp> using namespace vespalib; diff --git a/vespalib/src/tests/compression/compression_test.cpp b/vespalib/src/tests/compression/compression_test.cpp index 2257b57dc7e..3d8aeb02a81 100644 --- a/vespalib/src/tests/compression/compression_test.cpp +++ b/vespalib/src/tests/compression/compression_test.cpp @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/compressor.h> #include <vespa/vespalib/data/databuffer.h> diff --git a/vespalib/src/tests/directio/directio.cpp b/vespalib/src/tests/directio/directio.cpp index 01d6be84516..7362c33c7b6 100644 --- a/vespalib/src/tests/directio/directio.cpp +++ b/vespalib/src/tests/directio/directio.cpp @@ -15,7 +15,7 @@ TEST("that DirectIOException propagates the correct information.") { EXPECT_EQUAL(3u, e.getOffset()); EXPECT_EQUAL(msg, e.getBuffer()); EXPECT_EQUAL(0u, string(e.what()).find("DirectIO failed for file 'file.a' buffer=")); - EXPECT_EQUAL(string("file.a"), e.getFileName()); + EXPECT_EQUAL("file.a", e.getFileName()); } TEST("that DirectIOException is thrown on unaligned buf.") { @@ -30,7 +30,7 @@ TEST("that DirectIOException is thrown on unaligned buf.") { EXPECT_EQUAL(4_Ki, e.getLength()); EXPECT_EQUAL(0u, e.getOffset()); EXPECT_EQUAL(buf.getFree()+1, e.getBuffer()); - EXPECT_EQUAL(string(f.GetFileName()), e.getFileName()); + EXPECT_EQUAL(f.GetFileName(), e.getFileName()); caught = true; } EXPECT_TRUE(caught); @@ -48,7 +48,7 @@ TEST("that DirectIOException is thrown on unaligned offset.") { EXPECT_EQUAL(4_Ki, e.getLength()); EXPECT_EQUAL(1u, e.getOffset()); EXPECT_EQUAL(buf.getFree(), e.getBuffer()); - EXPECT_EQUAL(string(f.GetFileName()), e.getFileName()); + EXPECT_EQUAL(f.GetFileName(), e.getFileName()); caught = true; } EXPECT_TRUE(caught); diff --git a/vespalib/src/tests/fastlib/text/unicodeutiltest.cpp b/vespalib/src/tests/fastlib/text/unicodeutiltest.cpp index 7e8b52e6b30..6e86197bd3a 100644 --- a/vespalib/src/tests/fastlib/text/unicodeutiltest.cpp +++ b/vespalib/src/tests/fastlib/text/unicodeutiltest.cpp @@ -2,6 +2,7 @@ #include <vespa/fastlib/text/unicodeutil.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> TEST("GetUTF8Char_WrongInput") { const char *testdata = "ab\xF8"; @@ -15,17 +16,4 @@ TEST("GetUTF8Char_WrongInput") { EXPECT_EQUAL(Fast_UnicodeUtil::_BadUTF8Char, the_char); } -TEST("IsTerminalPunctuationChar") { - // test a small selection - - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar('!')); - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar(',')); - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar('.')); - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar(':')); - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar(';')); - EXPECT_FALSE(Fast_UnicodeUtil::IsTerminalPunctuationChar(' ')); - EXPECT_FALSE(Fast_UnicodeUtil::IsTerminalPunctuationChar('a')); - EXPECT_FALSE(Fast_UnicodeUtil::IsTerminalPunctuationChar('A')); -} - TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/vespalib/src/tests/io/fileutil/fileutiltest.cpp b/vespalib/src/tests/io/fileutil/fileutiltest.cpp index 8e08c8c88bb..51b755e1668 100644 --- a/vespalib/src/tests/io/fileutil/fileutiltest.cpp +++ b/vespalib/src/tests/io/fileutil/fileutiltest.cpp @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <filesystem> #include <iostream> #include <vector> diff --git a/vespalib/src/tests/memory/memory_test.cpp b/vespalib/src/tests/memory/memory_test.cpp index be413fd1a95..59d1cbe059d 100644 --- a/vespalib/src/tests/memory/memory_test.cpp +++ b/vespalib/src/tests/memory/memory_test.cpp @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/memory.h> using namespace vespalib; diff --git a/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp b/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp index 4a20f907fe6..aeaff93ffe9 100644 --- a/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp +++ b/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp @@ -2,6 +2,7 @@ #include <vespa/vespalib/net/tls/capability_set.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using namespace vespalib::net::tls; diff --git a/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp b/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp index 6d5c5fa6308..0912afde250 100644 --- a/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp +++ b/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp @@ -1,7 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/crypto/private_key.h> #include <vespa/vespalib/crypto/x509_certificate.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/data/smart_buffer.h> #include <vespa/vespalib/net/tls/authorization_mode.h> #include <vespa/vespalib/net/tls/crypto_codec.h> @@ -14,7 +13,8 @@ #include <vespa/vespalib/test/peer_policy_utils.h> #include <vespa/vespalib/util/size_literals.h> #include <stdexcept> -#include <stdlib.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using namespace vespalib::crypto; diff --git a/vespalib/src/tests/net/tls/policy_checking_certificate_verifier/policy_checking_certificate_verifier_test.cpp b/vespalib/src/tests/net/tls/policy_checking_certificate_verifier/policy_checking_certificate_verifier_test.cpp index 26db06e35f1..b80151e9ccf 100644 --- a/vespalib/src/tests/net/tls/policy_checking_certificate_verifier/policy_checking_certificate_verifier_test.cpp +++ b/vespalib/src/tests/net/tls/policy_checking_certificate_verifier/policy_checking_certificate_verifier_test.cpp @@ -3,6 +3,7 @@ #include <vespa/vespalib/net/tls/policy_checking_certificate_verifier.h> #include <vespa/vespalib/test/peer_policy_utils.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using namespace vespalib::net::tls; diff --git a/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp b/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp index 01e6113064a..a5fe850d85d 100644 --- a/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp +++ b/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp @@ -1,5 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/net/tls/protocol_snooping.h> using namespace vespalib; diff --git a/vespalib/src/tests/objects/nbostream/nbostream_test.cpp b/vespalib/src/tests/objects/nbostream/nbostream_test.cpp index a2501b836ce..91c83656353 100644 --- a/vespalib/src/tests/objects/nbostream/nbostream_test.cpp +++ b/vespalib/src/tests/objects/nbostream/nbostream_test.cpp @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/objects/hexdump.h> #include <vespa/vespalib/test/insertion_operators.h> diff --git a/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp b/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp index 62b7dc5f179..58027e35601 100644 --- a/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp +++ b/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/polymorphicarrays.h> #include <cassert> diff --git a/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp b/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp index bcd8ddb24f5..ef13421a6ec 100644 --- a/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp +++ b/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp @@ -3,6 +3,7 @@ #include <vespa/vespalib/util/adaptive_sequenced_executor.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/test/insertion_operators.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <condition_variable> #include <unistd.h> diff --git a/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp b/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp index 474df9bdf3b..beed490c214 100644 --- a/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp +++ b/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp @@ -6,6 +6,7 @@ #include <vespa/vespalib/util/singleexecutor.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/test/insertion_operators.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <condition_variable> #include <unistd.h> diff --git a/vespalib/src/tests/sha1/sha1_test.cpp b/vespalib/src/tests/sha1/sha1_test.cpp index d7777189074..df7dc423b00 100644 --- a/vespalib/src/tests/sha1/sha1_test.cpp +++ b/vespalib/src/tests/sha1/sha1_test.cpp @@ -1,7 +1,8 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include "rfc_sha1.h" +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/sha1.h> #include <vespa/vespalib/stllike/string.h> diff --git a/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp b/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp index 224a4a95afe..e20b42601c5 100644 --- a/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp +++ b/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp @@ -82,7 +82,7 @@ void verifyResizeTaskLimit(bool up) { EXPECT_EQUAL(1u, started); executor.setTaskLimit(targetTaskLimit); EXPECT_EQUAL(INITIAL_2inN, executor.getTaskLimit()); - EXPECT_EQUAL(INITIAL_2inN*waterMarkRatio, executor.get_watermark()); + EXPECT_EQUAL(INITIAL_2inN*waterMarkRatio, static_cast<double>(executor.get_watermark())); allowed = 5; while (started < 6); EXPECT_EQUAL(6u, started); @@ -101,7 +101,7 @@ void verifyResizeTaskLimit(bool up) { while (started < INITIAL + 1); EXPECT_EQUAL(INITIAL + 1, started); EXPECT_EQUAL(roundedTaskLimit, executor.getTaskLimit()); - EXPECT_EQUAL(roundedTaskLimit*waterMarkRatio, executor.get_watermark()); + EXPECT_EQUAL(roundedTaskLimit*waterMarkRatio, static_cast<double>(executor.get_watermark())); allowed = INITIAL + 1; } diff --git a/vespalib/src/tests/slime/slime_binary_format_test.cpp b/vespalib/src/tests/slime/slime_binary_format_test.cpp index 888016caf5f..31fa6037877 100644 --- a/vespalib/src/tests/slime/slime_binary_format_test.cpp +++ b/vespalib/src/tests/slime/slime_binary_format_test.cpp @@ -1,9 +1,10 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> +#include "type_traits.h" #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/data/simple_buffer.h> -#include "type_traits.h" #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib::slime::convenience; using namespace vespalib::slime::binary_format; diff --git a/vespalib/src/tests/slime/slime_inject_test.cpp b/vespalib/src/tests/slime/slime_inject_test.cpp index a9274e3073d..be9303879bd 100644 --- a/vespalib/src/tests/slime/slime_inject_test.cpp +++ b/vespalib/src/tests/slime/slime_inject_test.cpp @@ -1,7 +1,8 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/data/slime/strfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib::slime::convenience; diff --git a/vespalib/src/tests/slime/slime_test.cpp b/vespalib/src/tests/slime/slime_test.cpp index d2d1e368715..68c91fc900b 100644 --- a/vespalib/src/tests/slime/slime_test.cpp +++ b/vespalib/src/tests/slime/slime_test.cpp @@ -1,6 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/data/slime/object_value.h> #include <vespa/vespalib/data/slime/array_value.h> @@ -9,6 +8,8 @@ #include <vespa/vespalib/data/slime/symbol_table.h> #include <vespa/vespalib/data/slime/basic_value.h> #include <type_traits> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("slime_test"); diff --git a/vespalib/src/tests/state_server/state_server_test.cpp b/vespalib/src/tests/state_server/state_server_test.cpp index 6c248b54cc8..18dc54188ef 100644 --- a/vespalib/src/tests/state_server/state_server_test.cpp +++ b/vespalib/src/tests/state_server/state_server_test.cpp @@ -1,6 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/net/connection_auth_context.h> #include <vespa/vespalib/net/http/state_server.h> #include <vespa/vespalib/net/http/simple_health_producer.h> @@ -13,6 +12,8 @@ #include <vespa/vespalib/util/host_name.h> #include <vespa/vespalib/process/process.h> #include <sys/stat.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; diff --git a/vespalib/src/tests/stllike/hash_test.cpp b/vespalib/src/tests/stllike/hash_test.cpp index 592fc72edeb..0f5bbf29042 100644 --- a/vespalib/src/tests/stllike/hash_test.cpp +++ b/vespalib/src/tests/stllike/hash_test.cpp @@ -1,6 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/stllike/hash_set.hpp> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/stllike/hash_map_equal.hpp> @@ -8,6 +7,8 @@ #include <cstddef> #include <algorithm> #include <atomic> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using std::make_pair; diff --git a/vespalib/src/tests/testapp-generic/testapp-generic.cpp b/vespalib/src/tests/testapp-generic/testapp-generic.cpp index e63e78040fe..9b5a5c0426a 100644 --- a/vespalib/src/tests/testapp-generic/testapp-generic.cpp +++ b/vespalib/src/tests/testapp-generic/testapp-generic.cpp @@ -1,7 +1,8 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/stringfmt.h> #include <stdexcept> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; diff --git a/vespalib/src/vespa/fastlib/text/unicodeutil.h b/vespalib/src/vespa/fastlib/text/unicodeutil.h index 740cc9381b7..dd0c13738c6 100644 --- a/vespalib/src/vespa/fastlib/text/unicodeutil.h +++ b/vespalib/src/vespa/fastlib/text/unicodeutil.h @@ -41,8 +41,7 @@ private: _wordcharProp = 2, _ideographicProp = 4, _decimalDigitCharProp = 8, - _ignorableControlCharProp = 16, - _terminalPunctuationCharProp = 32 + _ignorableControlCharProp = 16 }; public: @@ -212,18 +211,6 @@ public: static int utf8cmp(const char *s1, const ucs4_t *s2) noexcept; /** - * Test for terminal punctuation. - * @param testchar the UCS4 character to test. - * @return true if testchar is a terminal punctuation character, - * i.e. if it has the terminal punctuation char property. - */ - static bool IsTerminalPunctuationChar(ucs4_t testchar) noexcept { - return (testchar < 65536 && - (_compCharProps[testchar >> 8][testchar & 255] & - _terminalPunctuationCharProp) != 0); - } - - /** * Get the next UCS4 character from an UTF-8 string buffer. * We assume that the first character in the UTF-8 string is >= 0x80 (non-ascii). * Modify the src pointer to allow future calls. diff --git a/vespalib/src/vespa/vespalib/testkit/test_kit.h b/vespalib/src/vespa/vespalib/testkit/test_kit.h index 5c86b88105d..bddc2e2622c 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_kit.h +++ b/vespalib/src/vespa/vespalib/testkit/test_kit.h @@ -10,3 +10,4 @@ #include "test_hook.h" #include "test_state_guard.h" #include <vespa/vespalib/util/time.h> +#include "test_master.hpp" diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.cpp b/vespalib/src/vespa/vespalib/testkit/test_master.cpp index 89a968cf990..c0587ae841b 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_master.cpp +++ b/vespalib/src/vespa/vespalib/testkit/test_master.cpp @@ -1,6 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "test_master.h" +#include "test_master.hpp" #include <vespa/vespalib/util/barrier.h> #include <vespa/vespalib/util/signalhandler.h> #include <cstring> diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.h b/vespalib/src/vespa/vespalib/testkit/test_master.h index 70d2b441b51..85684f9458f 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_master.h +++ b/vespalib/src/vespa/vespalib/testkit/test_master.h @@ -12,7 +12,6 @@ namespace vespalib { class Barrier; -#ifndef IAM_DOXYGEN /** * The master of testing. **/ @@ -123,9 +122,5 @@ public: bool discardFailedChecks(size_t failCnt); bool fini(); }; -#endif } // namespace vespalib - -#include "test_master.hpp" - diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.hpp b/vespalib/src/vespa/vespalib/testkit/test_master.hpp index ba5dc54e965..a5e25b7336b 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_master.hpp +++ b/vespalib/src/vespa/vespalib/testkit/test_master.hpp @@ -1,5 +1,8 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#pragma once +#include "test_master.h" + #include <sstream> namespace vespalib { |