Merge lp:~thomas-voss/dbus-cpp/remove-local-fork-and-run-and-cross-process-sync into lp:dbus-cpp

[Thomas Voß]

Remove local versions of cross-process-sync and fork-and-run.

Remove local versions of cross-process-sync and fork-and-run.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/79/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-trusty-i386-ci/58

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/79/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

OK, seems no tests were using this file.
lgtm.

review: Approve

=== removed file 'tests/cross_process_sync.h'
--- tests/cross_process_sync.h	2013-06-12 07:48:00 +0000
+++ tests/cross_process_sync.h	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-
-#ifndef CROSS_PROCESS_SYNC_H_
-#define CROSS_PROCESS_SYNC_H_
-
-#include <cstring>
-#include <stdexcept>
-
-#include <unistd.h>
-
-namespace test
-{
-struct CrossProcessSync
-{
-    static const int read_fd = 0;
-    static const int write_fd = 1;
-
-    CrossProcessSync()
-    {
-        if (pipe(fds) < 0)
-            throw std::runtime_error(strerror(errno));
-    }
-
-    ~CrossProcessSync() noexcept
-    {
-        ::close(fds[0]);
-        ::close(fds[1]);
-    }
-
-    void signal_ready()
-    {
-        int value = 42;
-        if (!write(fds[write_fd], std::addressof(value), sizeof(value)))
-            throw std::runtime_error(::strerror(errno));
-    }
-
-    void wait_for_signal_ready() const
-    {
-        int value;
-        if (!read(fds[read_fd], std::addressof(value), sizeof(value)))
-            throw std::runtime_error(::strerror(errno));
-    }
-
-    int fds[2];
-};
-}
-
-#endif // CROSS_PROCESS_SYNC_H_

=== removed file 'tests/fork_and_run.h'
--- tests/fork_and_run.h	2013-11-25 10:48:57 +0000
+++ tests/fork_and_run.h	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-
-#ifndef FORK_AND_RUN_H_
-#define FORK_AND_RUN_H_
-
-#include <gtest/gtest.h>
-
-#include <cstring>
-#include <functional>
-#include <stdexcept>
-
-#include <sys/types.h>
-#include <signal.h>
-#include <unistd.h>
-
-namespace test
-{
-bool is_child(pid_t pid)
-{
-    return pid == 0;
-}
-
-int fork_and_run(const std::function<void()>& service, const std::function<void()>& client)
-{
-    auto service_pid = fork();
-
-    if (service_pid < 0)
-    {
-        throw std::runtime_error(std::string("Could not fork child for service: ") + std::strerror(errno));
-    } else if (is_child(service_pid))
-    {
-        std::cout << "Running the service now: " << getpid() << std::endl;
-        service();
-        exit(EXIT_SUCCESS);
-    } else // parent
-    {
-        auto client_pid = fork();
-
-        if (client_pid < 0)
-        {
-            throw std::runtime_error(std::string("Could not fork child for client: ") + std::strerror(errno));
-        } else if (is_child(client_pid))
-        {
-            std::cout << "Running the client now: " << getpid() << std::endl;
-
-            try
-            {
-                client();
-            } catch(...)
-            {
-                exit(EXIT_FAILURE);
-            }
-
-            exit(::testing::Test::HasFatalFailure() || ::testing::Test::HasNonfatalFailure() ? EXIT_FAILURE : EXIT_SUCCESS);
-        } else // parent
-        {
-            std::cout << "In the test process: " << getpid() << std::endl;
-            int status;
-            auto result = waitpid(client_pid, &status, WUNTRACED);
-
-            if (result == -1)
-            {
-                throw std::runtime_error(std::string("Error waiting for child to complete: ") + std::strerror(errno));
-            }
-
-            ::kill(service_pid, SIGKILL);
-
-            int return_status = EXIT_FAILURE;
-            if (WIFEXITED(status))
-            {
-                std::cout << "Client exited with status: " << WEXITSTATUS(status) << std::endl;
-                return_status = WEXITSTATUS(status) == EXIT_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
-            } else if (WIFSIGNALED(status))
-            {
-                return_status = EXIT_FAILURE;
-            }
-
-            EXPECT_EQ(EXIT_SUCCESS, return_status);
-            return return_status;
-        }
-    }
-}
-}
-
-#endif // FORK_AND_RUN_H_