From b91f3a6cf89032c4f8887dcfac0c95e1cd0d9bfe Mon Sep 17 00:00:00 2001 From: Gregory A Lundberg Date: Sun, 11 Feb 2018 18:21:37 -0600 Subject: [PATCH] Disable two gui2 unit tests The gamestate inspector and game stats dialogs cause a segfault when compiled for LTO. --- src/tests/gui/test_gui2.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/tests/gui/test_gui2.cpp b/src/tests/gui/test_gui2.cpp index 477bb47fca24..6679d5e92e8d 100644 --- a/src/tests/gui/test_gui2.cpp +++ b/src/tests/gui/test_gui2.cpp @@ -363,6 +363,7 @@ void test_tip(const std::string& id) } } +#if 0 class dummy_display_context : public display_context { public: @@ -396,6 +397,7 @@ const display_context& get_dummy_display_context() static const dummy_display_context dedc = dummy_display_context(); return dedc; } +#endif } // namespace @@ -449,8 +451,8 @@ BOOST_AUTO_TEST_CASE(test_gui2) test(); test(); test(); - test(); - test(); + // test(); + // test(); test(); //test(); test(); @@ -542,6 +544,8 @@ BOOST_AUTO_TEST_CASE(test_gui2) "story_viewer", "outro", "mp_change_control", // Basically useless without a game_board object, so disabling + "game_stats", // segfault with LTO + "gamestate_inspector", // segfault with LTO }; std::vector missing; @@ -787,6 +791,7 @@ struct dialog_tester }; +#if 0 template<> struct dialog_tester { @@ -798,6 +803,7 @@ struct dialog_tester } }; +#endif template<> struct dialog_tester @@ -1162,6 +1168,7 @@ struct dialog_tester } }; +#if 0 template<> struct dialog_tester { @@ -1171,6 +1178,7 @@ struct dialog_tester return new game_stats(get_dummy_display_context(), 1, i); } }; +#endif template<> struct dialog_tester