1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2014-04-15 08:13:37 +0000
3
+++ CMakeLists.txt	2014-05-01 16:33:48 +0000
4
@@ -76,7 +76,7 @@
5
76
include_directories(include/shared)
76
include_directories(include/shared)
6
77
77
7
78
# Check for boost
78
# Check for boost
9
79
find_package(Boost 1.48.0 COMPONENTS chrono date_time filesystem system thread program_options regex REQUIRED)
79
find_package(Boost 1.48.0 COMPONENTS chrono date_time filesystem system thread program_options regex iostreams REQUIRED)
10
80
include_directories (
80
include_directories (
11
81
  ${Boost_INCLUDE_DIRS}
81
  ${Boost_INCLUDE_DIRS}
12
82
)
82
)
13
83
83
14
=== modified file 'debian/control'
15
--- debian/control	2014-04-15 05:32:16 +0000
16
+++ debian/control	2014-05-01 16:33:48 +0000
17
@@ -18,6 +18,7 @@
18
18
               libboost-thread-dev,
18
               libboost-thread-dev,
19
19
               libboost-regex-dev,
19
               libboost-regex-dev,
20
20
               libboost-filesystem-dev,
20
               libboost-filesystem-dev,
21
21
               libboost-iostreams-dev,
22
21
               protobuf-compiler,
22
               protobuf-compiler,
23
22
               libdrm-dev,
23
               libdrm-dev,
24
23
               libegl1-mesa-dev,
24
               libegl1-mesa-dev,
25
24
25
26
=== added file 'include/test/mir_test/popen.h'
27
--- include/test/mir_test/popen.h	1970-01-01 00:00:00 +0000
28
+++ include/test/mir_test/popen.h	2014-05-01 16:33:48 +0000
29
@@ -0,0 +1,59 @@
30
1
/*
31
2
 * Copyright © 2014 Canonical Ltd.
32
3
 *
33
4
 * This program is free software: you can redistribute it and/or modify it
34
5
 * under the terms of the GNU General Public License version 3,
35
6
 * as published by the Free Software Foundation.
36
7
 *
37
8
 * This program is distributed in the hope that it will be useful,
38
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
40
11
 * GNU General Public License for more details.
41
12
 *
42
13
 * You should have received a copy of the GNU General Public License
43
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
44
15
 *
45
16
 * Authored by: Alberto Aguirre <alberto.aguirre@canonical.com>
46
17
 */
47
18
48
19
49
20
#ifndef MIR_TEST_POPEN_H_
50
21
#define MIR_TEST_POPEN_H_
51
22
52
23
#include <cstdio>
53
24
#include <memory>
54
25
#include <string>
55
26
#include <streambuf>
56
27
#include <istream>
57
28
58
29
namespace mir
59
30
{
60
31
namespace test
61
32
{
62
33
/**
63
34
 *  Popen - A popen c++ wrapper
64
35
 */
65
36
class Popen
66
37
{
67
38
public:
68
39
    Popen(std::string const& cmd);
69
40
70
41
    /**
71
42
     * Read a line from the output of the executed command
72
43
     * returns false if there is nothing more to read
73
44
     */
74
45
    bool get_line(std::string& line);
75
46
76
47
private:
77
48
    Popen() = delete;
78
49
    Popen(Popen const&) = delete;
79
50
    Popen& operator=(Popen const&) = delete;
80
51
    std::unique_ptr<std::FILE, void(*)(FILE* f)> raw_stream;
81
52
    std::unique_ptr<std::streambuf> stream_buffer;
82
53
    std::istream stream;
83
54
};
84
55
85
56
}
86
57
}
87
58
88
59
#endif
89
0
60
90
=== modified file 'tests/mir_test/CMakeLists.txt'
91
--- tests/mir_test/CMakeLists.txt	2014-04-15 05:31:19 +0000
92
+++ tests/mir_test/CMakeLists.txt	2014-05-01 16:33:48 +0000
93
@@ -5,4 +5,5 @@
94
5
  display_config_matchers.cpp
5
  display_config_matchers.cpp
95
6
  cross_process_action.cpp
6
  cross_process_action.cpp
96
7
  spin_wait.cpp
7
  spin_wait.cpp
98
8
)
8
  popen.cpp
99
9
)
100
9
\ No newline at end of file
10
\ No newline at end of file
101
10
11
102
=== added file 'tests/mir_test/popen.cpp'
103
--- tests/mir_test/popen.cpp	1970-01-01 00:00:00 +0000
104
+++ tests/mir_test/popen.cpp	2014-05-01 16:33:48 +0000
105
@@ -0,0 +1,65 @@
106
1
/*
107
2
 * Copyright © 2014 Canonical Ltd.
108
3
 *
109
4
 * This program is free software: you can redistribute it and/or modify it
110
5
 * under the terms of the GNU General Public License version 3,
111
6
 * as published by the Free Software Foundation.
112
7
 *
113
8
 * This program is distributed in the hope that it will be useful,
114
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
115
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
116
11
 * GNU General Public License for more details.
117
12
 *
118
13
 * You should have received a copy of the GNU General Public License
119
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
120
15
 *
121
16
 * Authored by: Alberto Aguirre <alberto.aguirre@canonical.com>
122
17
 */
123
18
124
19
#include <mir_test/popen.h>
125
20
126
21
#include <boost/throw_exception.hpp>
127
22
#include <boost/exception/errinfo_errno.hpp>
128
23
#include <boost/iostreams/device/file_descriptor.hpp>
129
24
#include <boost/iostreams/stream_buffer.hpp>
130
25
131
26
#include <stdexcept>
132
27
133
28
namespace mt = mir::test;
134
29
namespace io = boost::iostreams;
135
30
136
31
namespace
137
32
{
138
33
std::unique_ptr<std::streambuf> create_stream_buffer(FILE* raw_stream)
139
34
{
140
35
    if (raw_stream == nullptr)
141
36
    {
142
37
        BOOST_THROW_EXCEPTION(
143
38
            boost::enable_error_info(std::runtime_error("popen failed"))
144
39
                << boost::errinfo_errno(errno));
145
40
    }
146
41
147
42
    int fd = fileno(raw_stream);
148
43
    if (fd == -1)
149
44
    {
150
45
        BOOST_THROW_EXCEPTION(
151
46
            boost::enable_error_info(std::runtime_error("invalid file stream"))
152
47
                << boost::errinfo_errno(errno));
153
48
    }
154
49
    auto raw = new io::stream_buffer<io::file_descriptor_source>{
155
50
        fd, io::never_close_handle};
156
51
    return std::unique_ptr<std::streambuf>(raw);
157
52
}
158
53
}
159
54
160
55
mt::Popen::Popen(std::string const& cmd)
161
56
    : raw_stream{popen(cmd.c_str(), "r"), [](FILE* f){ pclose(f); }},
162
57
      stream_buffer{create_stream_buffer(raw_stream.get())},
163
58
      stream{stream_buffer.get()}
164
59
{
165
60
}
166
61
167
62
bool mt::Popen::get_line(std::string& line)
168
63
{
169
64
    return std::getline(stream, line);
170
65
}
Status:	Merged
Approved by:	Alberto Aguirre on 2014-05-06
Approved revision:	no longer in the source branch.
Merged at revision:	1603
Proposed branch:	lp:~mir-team/mir/popen-cpp-wrapper
Merge into:	lp:mir
Diff against target:	170 lines (+128/-2) 5 files modified CMakeLists.txt (+1/-1) debian/control (+1/-0) include/test/mir_test/popen.h (+59/-0) tests/mir_test/CMakeLists.txt (+2/-1) tests/mir_test/popen.cpp (+65/-0)
To merge this branch:	bzr merge lp:~mir-team/mir/popen-cpp-wrapper
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Cemil Azizoglu (community)			Approve on 2014-05-06
Robert Carr (community)			Approve on 2014-05-06
Josh Arenson (community)		2014-04-30	Approve on 2014-05-02
PS Jenkins bot (community)	continuous-integration		Approve on 2014-05-01
Review via email: mp+217831@code.launchpad.net