diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-03 11:31:16 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-03 11:31:16 +0000 |
| commit | c0f3317ff8e0151a5a4858d0b39de6b997e38cb1 (patch) | |
| tree | f9fe3542ce30d15e0a7bee2755fb2ab6939e9476 /vespalib | |
| parent | 552836ddc04ac1ba6692bc97309a0f58105b4b8a (diff) | |
Update fixture test and fix for 7 Fs
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp | 4 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/testkit/generated_fixture_macros.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp b/vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp index 52ff7faca1f..ab18bc68472 100644 --- a/vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp +++ b/vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp @@ -47,7 +47,7 @@ void make_wrapper(int n) { out_list_nn(" Test(", "F%d &f%d_in", ") : ", n); out_if("f(f1_in), ", n == 1); out_list_nn("", "f%d(f%d_in)", " {} \\\n", n); - out(" virtual void test_entry_point(); \\\n"); + out(" void test_entry_point() override; \\\n"); out(" }; \\\n"); } @@ -92,7 +92,7 @@ void make_macro_impl(int n) { out(" TEST_CAT(TestKitHook, __LINE__)() : vespalib::TestHook(__FILE__, name, ignore) {} \\\n"); make_wrapper(n); make_dispatch(n); - out(" virtual bool run() { \\\n"); + out(" bool run() override { \\\n"); out(" TEST_STATE(name); \\\n"); out_if(" size_t num_threads(threads); (void) num_threads; \\\n", n > 0); if (n > 0) { diff --git a/vespalib/src/vespa/vespalib/testkit/generated_fixture_macros.h b/vespalib/src/vespa/vespalib/testkit/generated_fixture_macros.h index 94fc392bcdd..fc2d1a45ced 100644 --- a/vespalib/src/vespa/vespalib/testkit/generated_fixture_macros.h +++ b/vespalib/src/vespa/vespalib/testkit/generated_fixture_macros.h @@ -376,7 +376,7 @@ struct TEST_CAT(TestKitHook, __LINE__) : vespalib::TestHook { \ size_t num_threads(threads); (void) num_threads; \ return dispatch2(f1, new fixture2); \ } \ - virtual bool run() { \ + bool run() override { \ TEST_STATE(name); \ size_t num_threads(threads); (void) num_threads; \ return dispatch1(new fixture1); \ @@ -414,7 +414,7 @@ struct TEST_CAT(TestKitHook, __LINE__) : vespalib::TestHook { \ F6 &f6; \ F7 &f7; \ Test(F1 &f1_in, F2 &f2_in, F3 &f3_in, F4 &f4_in, F5 &f5_in, F6 &f6_in, F7 &f7_in) : f1(f1_in), f2(f2_in), f3(f3_in), f4(f4_in), f5(f5_in), f6(f6_in), f7(f7_in) {} \ - virtual void test_entry_point(); \ + void test_entry_point() override; \ }; \ template <typename F1, typename F2, typename F3, typename F4, typename F5, typename F6, typename F7> \ bool dispatch7(F1 &f1, F2 &f2, F3 &f3, F4 &f4, F5 &f5, F6 &f6, F7 *_f7_ptr_) { \ |