Mercurial > irccd
changeset 803:14f9e3b03779
tests: don't store IRCCDCTL_EXECUTABLE, closes #949 @1h
line wrap: on
line diff
--- a/libirccd-test/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/libirccd-test/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -63,9 +63,4 @@ libirccd-ctl PUBLIC_INCLUDES $<BUILD_INTERFACE:${libirccd-test_SOURCE_DIR}> - FLAGS - $<BUILD_INTERFACE:IRCCD_EXECUTABLE="$<TARGET_FILE:irccd>"> - $<BUILD_INTERFACE:IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>"> - $<INSTALL_INTERFACE:IRCCD_EXECUTABLE="$<TARGET_FILE:irccd::irccd>"> - $<INSTALL_INTERFACE:IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccd::irccdctl>"> )
--- a/libirccd-test/irccd/test/cli_fixture.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/libirccd-test/irccd/test/cli_fixture.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -46,8 +46,9 @@ } // !namespace -cli_fixture::cli_fixture() - : server_(new mock_server(irccd_.get_service(), "test", "localhost")) +cli_fixture::cli_fixture(std::string irccdctl) + : irccdctl_(std::move(irccdctl)) + , server_(new mock_server(irccd_.get_service(), "test", "localhost")) { using boost::asio::ip::tcp; @@ -86,7 +87,7 @@ { std::ostringstream oss; - oss << IRCCDCTL_EXECUTABLE << " -t ip --hostname 127.0.0.1 -p " << port_ << " "; + oss << irccdctl_ << " -t ip --hostname 127.0.0.1 -p " << port_ << " "; oss << string_util::join(args, " "); proc::ipstream stream_out, stream_err;
--- a/libirccd-test/irccd/test/cli_fixture.hpp Mon Nov 12 21:42:23 2018 +0100 +++ b/libirccd-test/irccd/test/cli_fixture.hpp Tue Nov 13 20:21:18 2018 +0100 @@ -53,6 +53,7 @@ private: using io_service = boost::asio::io_service; + std::string irccdctl_; std::thread thread_; std::uint16_t port_{0U}; io_service service_; @@ -83,8 +84,10 @@ /** * Construct and initialize and irccd daemon running in a thread. + * + * \param irccdctl path to irccdctl */ - cli_fixture(); + cli_fixture(std::string irccdctl); /** * Stop irccd and close everything.
--- a/tests/src/irccdctl/cli-plugin-config/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-config/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-plugin-config/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-config/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -28,9 +28,10 @@ namespace { -class configurable_plugin_cli_fixture : public cli_fixture { +class plugin_config_fixture : public cli_fixture { public: - configurable_plugin_cli_fixture() + plugin_config_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) { auto conf1 = std::make_unique<mock_plugin>("conf1"); auto conf2 = std::make_unique<mock_plugin>("conf2"); @@ -45,7 +46,7 @@ } }; -BOOST_FIXTURE_TEST_SUITE(plugin_config_suite, configurable_plugin_cli_fixture) +BOOST_FIXTURE_TEST_SUITE(plugin_config_suite, plugin_config_fixture) BOOST_AUTO_TEST_CASE(set_and_get) {
--- a/tests/src/irccdctl/cli-plugin-info/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-info/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-plugin-info/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-info/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -28,7 +28,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(plugin_info_suite, cli_fixture) +class plugin_info_fixture : public cli_fixture { +public: + plugin_info_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(plugin_info_suite, plugin_info_fixture) BOOST_AUTO_TEST_CASE(simple) {
--- a/tests/src/irccdctl/cli-plugin-list/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-list/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-plugin-list/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-list/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -28,7 +28,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(plugin_list_suite, cli_fixture) +class plugin_list_fixture : public cli_fixture { +public: + plugin_list_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(plugin_list_suite, plugin_list_fixture) BOOST_AUTO_TEST_CASE(output) {
--- a/tests/src/irccdctl/cli-plugin-load/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-load/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-plugin-load/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-load/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -46,9 +46,17 @@ } }; +class plugin_list_fixture : public cli_fixture { +public: + plugin_list_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + } // !namespace -BOOST_FIXTURE_TEST_SUITE(plugin_load_suite, cli_fixture) +BOOST_FIXTURE_TEST_SUITE(plugin_load_suite, plugin_list_fixture) BOOST_AUTO_TEST_CASE(simple) {
--- a/tests/src/irccdctl/cli-plugin-reload/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-reload/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-plugin-reload/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-reload/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -46,7 +46,15 @@ } }; -BOOST_FIXTURE_TEST_SUITE(plugin_reload_suite, cli_fixture) +class plugin_reload_fixture : public cli_fixture { +public: + plugin_reload_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(plugin_reload_suite, plugin_reload_fixture) BOOST_AUTO_TEST_CASE(simple) {
--- a/tests/src/irccdctl/cli-plugin-unload/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-unload/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-plugin-unload/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-plugin-unload/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -46,7 +46,15 @@ } }; -BOOST_FIXTURE_TEST_SUITE(plugin_unload_suite, cli_fixture) +class plugin_unload_fixture : public cli_fixture { +public: + plugin_unload_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(plugin_unload_suite, plugin_unload_fixture) BOOST_AUTO_TEST_CASE(simple) {
--- a/tests/src/irccdctl/cli-rule-add/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-add/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-rule-add/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-add/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(rule_add_suite, cli_fixture) +class rule_add_fixture : public cli_fixture { +public: + rule_add_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(rule_add_suite, rule_add_fixture) BOOST_AUTO_TEST_CASE(all) {
--- a/tests/src/irccdctl/cli-rule-edit/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-edit/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-rule-edit/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-edit/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,9 +27,10 @@ namespace { -class custom_cli_fixture : public cli_fixture { +class rule_edit_fixture : public cli_fixture { public: - custom_cli_fixture() + rule_edit_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) { irccd_.rules().add({ { "s1", "s2" }, @@ -42,7 +43,7 @@ } }; -BOOST_FIXTURE_TEST_SUITE(rule_edit_suite, custom_cli_fixture) +BOOST_FIXTURE_TEST_SUITE(rule_edit_suite, rule_edit_fixture) BOOST_AUTO_TEST_CASE(server) {
--- a/tests/src/irccdctl/cli-rule-info/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-info/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-rule-info/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-info/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(rule_info_suite, cli_fixture) +class rule_info_fixture : public cli_fixture { +public: + rule_info_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(rule_info_suite, rule_info_fixture) BOOST_AUTO_TEST_CASE(info) {
--- a/tests/src/irccdctl/cli-rule-list/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-list/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-rule-list/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-list/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(rule_list_suite, cli_fixture) +class rule_list_fixture : public cli_fixture { +public: + rule_list_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(rule_list_suite, rule_list_fixture) BOOST_AUTO_TEST_CASE(simple) {
--- a/tests/src/irccdctl/cli-rule-move/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-move/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-rule-move/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-move/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,9 +27,10 @@ namespace { -class custom_cli_fixture : public cli_fixture { +class rule_move_fixture : public cli_fixture { public: - custom_cli_fixture() + rule_move_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) { irccd_.rules().add({ { "s1" }, @@ -58,7 +59,7 @@ } }; -BOOST_FIXTURE_TEST_SUITE(rule_move_suite, custom_cli_fixture) +BOOST_FIXTURE_TEST_SUITE(rule_move_suite, rule_move_fixture) BOOST_AUTO_TEST_CASE(from_0_to_1) {
--- a/tests/src/irccdctl/cli-rule-remove/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-remove/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-rule-remove/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-rule-remove/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,9 +27,10 @@ namespace { -class custom_cli_fixture : public cli_fixture { +class rule_remove_fixture : public cli_fixture { public: - custom_cli_fixture() + rule_remove_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) { irccd_.rules().add({ { "s1" }, @@ -58,7 +59,7 @@ } }; -BOOST_FIXTURE_TEST_SUITE(rule_move_suite, custom_cli_fixture) +BOOST_FIXTURE_TEST_SUITE(rule_move_suite, rule_remove_fixture) BOOST_AUTO_TEST_CASE(simple) {
--- a/tests/src/irccdctl/cli-server-disconnect/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-disconnect/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-disconnect/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-disconnect/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_disconnect_suite, cli_fixture) +class server_disconnect_fixture : public cli_fixture { +public: + server_disconnect_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_disconnect_suite, server_disconnect_fixture) BOOST_AUTO_TEST_CASE(one) {
--- a/tests/src/irccdctl/cli-server-info/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-info/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-info/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-info/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_info_suite, cli_fixture) +class server_info_fixture : public cli_fixture { +public: + server_info_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_info_suite, server_info_fixture) BOOST_AUTO_TEST_CASE(output) {
--- a/tests/src/irccdctl/cli-server-invite/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-invite/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-invite/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-invite/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_invite_suite, cli_fixture) +class server_invite_fixture : public cli_fixture { +public: + server_invite_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_invite_suite, server_invite_fixture) BOOST_AUTO_TEST_CASE(output) {
--- a/tests/src/irccdctl/cli-server-join/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-join/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-join/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-join/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_join_suite, cli_fixture) +class server_join_fixture : public cli_fixture { +public: + server_join_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_join_suite, server_join_fixture) BOOST_AUTO_TEST_CASE(basic) {
--- a/tests/src/irccdctl/cli-server-kick/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-kick/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-kick/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-kick/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_kick_suite, cli_fixture) +class server_kick_fixture : public cli_fixture { +public: + server_kick_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_kick_suite, server_kick_fixture) BOOST_AUTO_TEST_CASE(basic) {
--- a/tests/src/irccdctl/cli-server-list/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-list/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-list/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-list/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_list_suite, cli_fixture) +class server_list_fixture : public cli_fixture { +public: + server_list_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_list_suite, server_list_fixture) BOOST_AUTO_TEST_CASE(output) {
--- a/tests/src/irccdctl/cli-server-me/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-me/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-me/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-me/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_me_suite, cli_fixture) +class server_me_fixture : public cli_fixture { +public: + server_me_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_me_suite, server_me_fixture) BOOST_AUTO_TEST_CASE(basic) {
--- a/tests/src/irccdctl/cli-server-message/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-message/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-message/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-message/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_message_suite, cli_fixture) +class server_message_fixture : public cli_fixture { +public: + server_message_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_message_suite, server_message_fixture) BOOST_AUTO_TEST_CASE(basic) {
--- a/tests/src/irccdctl/cli-server-mode/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-mode/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-mode/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-mode/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_mode_suite, cli_fixture) +class server_mode_fixture : public cli_fixture { +public: + server_mode_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_mode_suite, server_mode_fixture) BOOST_AUTO_TEST_CASE(user) {
--- a/tests/src/irccdctl/cli-server-nick/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-nick/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-nick/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-nick/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_nick_suite, cli_fixture) +class server_nick_fixture : public cli_fixture { +public: + server_nick_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_nick_suite, server_nick_fixture) BOOST_AUTO_TEST_CASE(not_connected) {
--- a/tests/src/irccdctl/cli-server-notice/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-notice/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-notice/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-notice/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_notice_suite, cli_fixture) +class server_notice_fixture : public cli_fixture { +public: + server_notice_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_notice_suite, server_notice_fixture) BOOST_AUTO_TEST_CASE(basic) {
--- a/tests/src/irccdctl/cli-server-part/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-part/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-part/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-part/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_part_suite, cli_fixture) +class server_part_fixture : public cli_fixture { +public: + server_part_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_part_suite, server_part_fixture) BOOST_AUTO_TEST_CASE(basic) {
--- a/tests/src/irccdctl/cli-server-reconnect/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-reconnect/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-reconnect/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-reconnect/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_reconnect_suite, cli_fixture) +class server_reconnect_fixture : public cli_fixture { +public: + server_reconnect_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_reconnect_suite, server_reconnect_fixture) BOOST_AUTO_TEST_CASE(one) {
--- a/tests/src/irccdctl/cli-server-topic/CMakeLists.txt Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-topic/CMakeLists.txt Tue Nov 13 20:21:18 2018 +0100 @@ -21,4 +21,5 @@ SOURCES main.cpp LIBRARIES libirccd-core DEPENDS irccd irccdctl + FLAGS IRCCDCTL_EXECUTABLE="$<TARGET_FILE:irccdctl>" )
--- a/tests/src/irccdctl/cli-server-topic/main.cpp Mon Nov 12 21:42:23 2018 +0100 +++ b/tests/src/irccdctl/cli-server-topic/main.cpp Tue Nov 13 20:21:18 2018 +0100 @@ -27,7 +27,15 @@ namespace { -BOOST_FIXTURE_TEST_SUITE(server_topic_suite, cli_fixture) +class server_topic_fixture : public cli_fixture { +public: + server_topic_fixture() + : cli_fixture(IRCCDCTL_EXECUTABLE) + { + } +}; + +BOOST_FIXTURE_TEST_SUITE(server_topic_suite, server_topic_fixture) BOOST_AUTO_TEST_CASE(basic) {