1
=== added file 'include/shared/mir/fatal.h'
2
--- include/shared/mir/fatal.h	1970-01-01 00:00:00 +0000
3
+++ include/shared/mir/fatal.h	2014-07-14 06:58:31 +0000
4
@@ -0,0 +1,52 @@
5
1
/*
6
2
 * Copyright © 2014 Canonical Ltd.
7
3
 *
8
4
 * This program is free software: you can redistribute it and/or modify
9
5
 * it under the terms of the GNU Lesser General Public License version 3 as
10
6
 * published by the Free Software Foundation.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU Lesser General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU Lesser General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 *
20
16
 * ---
21
17
 * Fatal error handling - Fatal errors are situations we don't expect to ever
22
18
 * happen and don't have logic to gracefully recover from. The most useful
23
19
 * thing you can do in that situation is abort to get a clean core file and
24
20
 * stack trace to maximize the chances of it being readable.
25
21
 *
26
22
 * Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
27
23
 */
28
24
29
25
#ifndef MIR_FATAL_H_
30
26
#define MIR_FATAL_H_
31
27
32
28
namespace mir
33
29
{
34
30
/**
35
31
 * Kill the program and dump core as cleanly as possible. Note the reason
36
32
 * parameter is a simple char* so its value is clearly visible in stack trace
37
33
 * output.
38
34
 * mir::abort() is strictly for "this should never happen" situations that
39
35
 * you cannot recover from.
40
36
 *   \param [in] reason  A printf-style format string.
41
37
 */
42
38
void abort(char const* reason, ...);
43
39
44
40
/**
45
41
 * Mir-specific assert() function that is NEVER optimized out, always tested
46
42
 * even in release builds.
47
43
 */
48
44
#define mir_assert(expr) \
49
45
{ \
50
46
    if (!(expr)) ::mir::_fail_assertion(__FILE__, __LINE__, #expr); \
51
47
}
52
48
void _fail_assertion(char const* file, int line, char const* expr);
53
49
54
50
} // namespace mir
55
51
56
52
#endif // MIR_FATAL_H_
57
0
53
58
=== modified file 'src/platform/graphics/mesa/CMakeLists.txt'
59
--- src/platform/graphics/mesa/CMakeLists.txt	2014-04-22 23:15:16 +0000
60
+++ src/platform/graphics/mesa/CMakeLists.txt	2014-07-14 06:58:31 +0000
61
@@ -44,9 +44,9 @@
62
44
  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
44
  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/mesa
63
45
)
45
)
64
46
46
67
47
target_link_libraries(
47
target_link_libraries(mirplatformgraphicsmesa
66
48
  mirplatformgraphicsmesa
68
49
  mirplatform
48
  mirplatform
69
49
  mirfatal
70
50
50
71
51
  ${Boost_PROGRAM_OPTIONS_LIBRARY}
51
  ${Boost_PROGRAM_OPTIONS_LIBRARY}
72
52
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
52
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
73
53
53
74
=== modified file 'src/platform/graphics/mesa/display_buffer.cpp'
75
--- src/platform/graphics/mesa/display_buffer.cpp	2014-07-09 08:22:57 +0000
76
+++ src/platform/graphics/mesa/display_buffer.cpp	2014-07-14 06:58:31 +0000
77
@@ -22,6 +22,7 @@
78
22
#include "mir/graphics/display_report.h"
22
#include "mir/graphics/display_report.h"
79
23
#include "bypass.h"
23
#include "bypass.h"
80
24
#include "gbm_buffer.h"
24
#include "gbm_buffer.h"
81
25
#include "mir/fatal.h"
82
25
26
83
26
#include <boost/throw_exception.hpp>
27
#include <boost/throw_exception.hpp>
84
27
#include <GLES2/gl2.h>
28
#include <GLES2/gl2.h>
85
@@ -143,18 +144,18 @@
86
143
    glClear(GL_COLOR_BUFFER_BIT);
144
    glClear(GL_COLOR_BUFFER_BIT);
87
144
145
88
145
    if (!egl.swap_buffers())
146
    if (!egl.swap_buffers())
90
146
        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to perform initial surface buffer swap"));
147
        mir::abort("Failed to perform initial surface buffer swap");
91
147
148
92
148
    listener->report_successful_egl_buffer_swap_on_construction();
149
    listener->report_successful_egl_buffer_swap_on_construction();
93
149
150
94
150
    scheduled_bufobj = get_front_buffer_object();
151
    scheduled_bufobj = get_front_buffer_object();
95
151
    if (!scheduled_bufobj)
152
    if (!scheduled_bufobj)
97
152
        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to get frontbuffer"));
153
        mir::abort("Failed to get frontbuffer");
98
153
154
99
154
    for (auto& output : outputs)
155
    for (auto& output : outputs)
100
155
    {
156
    {
101
156
        if (!output->set_crtc(scheduled_bufobj->get_drm_fb_id()))
157
        if (!output->set_crtc(scheduled_bufobj->get_drm_fb_id()))
103
157
            BOOST_THROW_EXCEPTION(std::runtime_error("Failed to set DRM crtc"));
158
            mir::abort("Failed to set DRM crtc");
104
158
    }
159
    }
105
159
160
106
160
    egl.release_current();
161
    egl.release_current();
107
@@ -256,7 +257,7 @@
108
256
     * corresponding to the front buffer.
257
     * corresponding to the front buffer.
109
257
     */
258
     */
110
258
    if (!bypass_buf && !egl.swap_buffers())
259
    if (!bypass_buf && !egl.swap_buffers())
112
259
        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to perform initial surface buffer swap"));
260
        mir::abort("Failed to perform initial surface buffer swap");
113
260
261
114
261
    mgm::BufferObject *bufobj;
262
    mgm::BufferObject *bufobj;
115
262
    if (bypass_buf)
263
    if (bypass_buf)
116
@@ -271,7 +272,7 @@
117
271
    }
272
    }
118
272
273
119
273
    if (!bufobj)
274
    if (!bufobj)
121
274
        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to get front buffer object"));
275
        mir::abort("Failed to get front buffer object");
122
275
276
123
276
    /*
277
    /*
124
277
     * Schedule the current front buffer object for display, and wait
278
     * Schedule the current front buffer object for display, and wait
125
@@ -284,14 +285,14 @@
126
284
    {
285
    {
127
285
        if (!bypass_buf)
286
        if (!bypass_buf)
128
286
            bufobj->release();
287
            bufobj->release();
130
287
        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to schedule page flip"));
288
        mir::abort("Failed to schedule page flip");
131
288
    }
289
    }
132
289
    else if (needs_set_crtc)
290
    else if (needs_set_crtc)
133
290
    {
291
    {
134
291
        for (auto& output : outputs)
292
        for (auto& output : outputs)
135
292
        {
293
        {
136
293
            if (!output->set_crtc(bufobj->get_drm_fb_id()))
294
            if (!output->set_crtc(bufobj->get_drm_fb_id()))
138
294
                BOOST_THROW_EXCEPTION(std::runtime_error("Failed to set DRM crtc"));
295
                mir::abort("Failed to set DRM crtc");
139
295
        }
296
        }
140
296
        needs_set_crtc = false;
297
        needs_set_crtc = false;
141
297
    }
298
    }
142
@@ -397,7 +398,7 @@
143
397
{
398
{
144
398
    if (!egl.make_current())
399
    if (!egl.make_current())
145
399
    {
400
    {
147
400
        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to make EGL surface current"));
401
        mir::abort("Failed to make EGL surface current");
148
401
    }
402
    }
149
402
}
403
}
150
403
404
151
404
405
152
=== modified file 'src/platform/graphics/mesa/real_kms_output.cpp'
153
--- src/platform/graphics/mesa/real_kms_output.cpp	2014-07-09 10:48:47 +0000
154
+++ src/platform/graphics/mesa/real_kms_output.cpp	2014-07-14 06:58:31 +0000
155
@@ -18,11 +18,7 @@
156
18
18
157
19
#include "real_kms_output.h"
19
#include "real_kms_output.h"
158
20
#include "page_flipper.h"
20
#include "page_flipper.h"
164
21
21
#include "mir/fatal.h"
160
22
#include <boost/throw_exception.hpp>
161
23
#include <boost/exception/info.hpp>
162
24
163
25
#include <stdexcept>
165
26
#include <vector>
22
#include <vector>
166
27
#include <string.h> // strcmp
23
#include <string.h> // strcmp
167
28
24
168
@@ -166,7 +162,7 @@
169
166
    connector = resources.connector(connector_id);
162
    connector = resources.connector(connector_id);
170
167
163
171
168
    if (!connector)
164
    if (!connector)
173
169
        BOOST_THROW_EXCEPTION(std::runtime_error("No DRM connector found\n"));
165
        mir::abort("No DRM connector found");
174
170
166
175
171
    // TODO: What if we can't locate the DPMS property?
167
    // TODO: What if we can't locate the DPMS property?
176
172
    for (int i = 0; i < connector->count_props; i++)
168
    for (int i = 0; i < connector->count_props; i++)
177
@@ -202,9 +198,10 @@
178
202
bool mgm::RealKMSOutput::set_crtc(uint32_t fb_id)
198
bool mgm::RealKMSOutput::set_crtc(uint32_t fb_id)
179
203
{
199
{
180
204
    if (!ensure_crtc())
200
    if (!ensure_crtc())
184
205
        BOOST_THROW_EXCEPTION(std::runtime_error("Output " +
201
    {
185
206
            connector_name(connector.get()) +
202
        mir::abort("Output %s has no associated CRTC to set a framebuffer on",
186
207
            " has no associated CRTC to set a framebuffer on"));
203
                    connector_name(connector.get()).c_str());
187
204
    }
188
208
205
189
209
    auto ret = drmModeSetCrtc(drm_fd, current_crtc->crtc_id,
206
    auto ret = drmModeSetCrtc(drm_fd, current_crtc->crtc_id,
190
210
                              fb_id, fb_offset.dx.as_int(), fb_offset.dy.as_int(),
207
                              fb_id, fb_offset.dx.as_int(), fb_offset.dy.as_int(),
191
@@ -235,12 +232,8 @@
192
235
                                 0, 0, 0, nullptr, 0, nullptr);
232
                                 0, 0, 0, nullptr, 0, nullptr);
193
236
    if (result)
233
    if (result)
194
237
    {
234
    {
201
238
        std::string const msg =
235
        mir::abort("Couldn't clear output %s (drmModeSetCrtc = %d)",
202
239
            "Couldn't clear output " + connector_name(connector.get());
236
                   connector_name(connector.get()).c_str(), result);
197
240
198
241
        BOOST_THROW_EXCEPTION(
199
242
            ::boost::enable_error_info(std::runtime_error(msg))
200
243
                << (boost::error_info<KMSOutput, decltype(result)>(result)));
203
244
    }
237
    }
204
245
238
205
246
    current_crtc = nullptr;
239
    current_crtc = nullptr;
206
@@ -252,10 +245,10 @@
207
252
    if (power_mode != mir_power_mode_on)
245
    if (power_mode != mir_power_mode_on)
208
253
        return true;
246
        return true;
209
254
    if (!current_crtc)
247
    if (!current_crtc)
214
255
        BOOST_THROW_EXCEPTION(std::runtime_error("Output " +
248
    {
215
256
            connector_name(connector.get()) +
249
        mir::abort("Output %s has no associated CRTC to schedule page flips on",
216
257
            " has no associated CRTC to schedule page flips on"));
250
                   connector_name(connector.get()).c_str());
217
258
251
    }
218
259
    return page_flipper->schedule_flip(current_crtc->crtc_id, fb_id);
252
    return page_flipper->schedule_flip(current_crtc->crtc_id, fb_id);
219
260
}
253
}
220
261
254
221
@@ -265,10 +258,10 @@
222
265
    if (power_mode != mir_power_mode_on)
258
    if (power_mode != mir_power_mode_on)
223
266
        return;
259
        return;
224
267
    if (!current_crtc)
260
    if (!current_crtc)
229
268
        BOOST_THROW_EXCEPTION(std::runtime_error("Output " +
261
    {
230
269
            connector_name(connector.get()) +
262
        mir::abort("Output %s has no associated CRTC to wait on",
231
270
            " has no associated CRTC to wait on"));
263
                   connector_name(connector.get()).c_str());
232
271
264
    }
233
272
    page_flipper->wait_for_flip(current_crtc->crtc_id);
265
    page_flipper->wait_for_flip(current_crtc->crtc_id);
234
273
}
266
}
235
274
267
236
@@ -283,9 +276,7 @@
237
283
                gbm_bo_get_width(buffer),
276
                gbm_bo_get_width(buffer),
238
284
                gbm_bo_get_height(buffer)))
277
                gbm_bo_get_height(buffer)))
239
285
        {
278
        {
243
286
            BOOST_THROW_EXCEPTION(
279
            mir::abort("drmModeSetCursor failed (returned %d)", result);
241
287
                ::boost::enable_error_info(std::runtime_error("drmModeSetCursor() failed"))
242
288
                    << (boost::error_info<KMSOutput, decltype(result)>(result)));
244
289
        }
280
        }
245
290
281
246
291
        has_cursor_ = true;
282
        has_cursor_ = true;
247
@@ -300,9 +291,7 @@
248
300
                                            destination.x.as_uint32_t(),
291
                                            destination.x.as_uint32_t(),
249
301
                                            destination.y.as_uint32_t()))
292
                                            destination.y.as_uint32_t()))
250
302
        {
293
        {
254
303
            BOOST_THROW_EXCEPTION(
294
            mir::abort("drmModeMoveCursor failed (returned %d)", result);
252
304
                ::boost::enable_error_info(std::runtime_error("drmModeMoveCursor() failed"))
253
305
                    << (boost::error_info<KMSOutput, decltype(result)>(result)));
255
306
        }
295
        }
256
307
    }
296
    }
257
308
}
297
}
258
309
298
259
=== modified file 'src/shared/CMakeLists.txt'
260
--- src/shared/CMakeLists.txt	2014-07-11 03:33:03 +0000
261
+++ src/shared/CMakeLists.txt	2014-07-14 06:58:31 +0000
262
@@ -14,6 +14,7 @@
263
14
add_subdirectory(sharedlibrary)
14
add_subdirectory(sharedlibrary)
264
15
add_subdirectory(thread)
15
add_subdirectory(thread)
265
16
add_subdirectory(testdraw)
16
add_subdirectory(testdraw)
266
17
add_subdirectory(fatal)
267
17
18
268
18
set(
19
set(
269
19
  MIR_COMMON_PLATFORM_LIBRARIES
20
  MIR_COMMON_PLATFORM_LIBRARIES
270
20
21
271
=== added directory 'src/shared/fatal'
272
=== added file 'src/shared/fatal/CMakeLists.txt'
273
--- src/shared/fatal/CMakeLists.txt	1970-01-01 00:00:00 +0000
274
+++ src/shared/fatal/CMakeLists.txt	2014-07-14 06:58:31 +0000
275
@@ -0,0 +1,3 @@
276
1
add_library(mirfatal STATIC
277
2
  fatal.cpp
278
3
)
279
0
4
280
=== added file 'src/shared/fatal/fatal.cpp'
281
--- src/shared/fatal/fatal.cpp	1970-01-01 00:00:00 +0000
282
+++ src/shared/fatal/fatal.cpp	2014-07-14 06:58:31 +0000
283
@@ -0,0 +1,43 @@
284
1
/*
285
2
 * Copyright © 2014 Canonical Ltd.
286
3
 *
287
4
 * This program is free software: you can redistribute it and/or modify it
288
5
 * under the terms of the GNU Lesser General Public License version 3,
289
6
 * as published by the Free Software Foundation.
290
7
 *
291
8
 * This program is distributed in the hope that it will be useful,
292
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
293
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
294
11
 * GNU Lesser General Public License for more details.
295
12
 *
296
13
 * You should have received a copy of the GNU Lesser General Public License
297
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
298
15
*
299
16
 * Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
300
17
 */
301
18
302
19
#include "mir/fatal.h"
303
20
#include <cstdlib>
304
21
#include <cstdio>
305
22
#include <cstdarg>
306
23
307
24
void mir::abort(char const* reason, ...)
308
25
{
309
26
    va_list args;
310
27
311
28
    // Keep this as simple as possible, avoiding any object construction and
312
29
    // minimizing the potential for heap operations between the error location
313
30
    // and the abort().
314
31
    va_start(args, reason);
315
32
    fprintf(stderr, "Mir fatal error: ");
316
33
    vfprintf(stderr, reason, args);
317
34
    fprintf(stderr, "\n");
318
35
    va_end(args);
319
36
320
37
    std::abort();
321
38
}
322
39
323
40
void mir::_fail_assertion(char const* file, int line, char const* expr)
324
41
{
325
42
    mir::abort("Assertion failed at %s:%d: %s", file, line, expr);
326
43
}
327
0
44
328
=== modified file 'tests/acceptance-tests/CMakeLists.txt'
329
--- tests/acceptance-tests/CMakeLists.txt	2014-07-11 14:04:15 +0000
330
+++ tests/acceptance-tests/CMakeLists.txt	2014-07-14 06:58:31 +0000
331
@@ -64,6 +64,7 @@
332
64
  mirserver
64
  mirserver
333
65
  mirclient
65
  mirclient
334
66
  mirplatform
66
  mirplatform
335
67
  mirfatal
336
67
68
337
68
  mir-test
69
  mir-test
338
69
  mir-test-framework
70
  mir-test-framework
339
70
71
340
=== modified file 'tests/acceptance-tests/test_server_shutdown.cpp'
341
--- tests/acceptance-tests/test_server_shutdown.cpp	2014-07-09 07:54:29 +0000
342
+++ tests/acceptance-tests/test_server_shutdown.cpp	2014-07-14 06:58:31 +0000
343
@@ -23,6 +23,7 @@
344
23
#include "mir/compositor/display_buffer_compositor_factory.h"
23
#include "mir/compositor/display_buffer_compositor_factory.h"
345
24
#include "mir/input/composite_event_filter.h"
24
#include "mir/input/composite_event_filter.h"
346
25
#include "mir/run_mir.h"
25
#include "mir/run_mir.h"
347
26
#include "mir/fatal.h"
348
26
27
349
27
#include "mir_test_framework/display_server_test_fixture.h"
28
#include "mir_test_framework/display_server_test_fixture.h"
350
28
#include "mir_test/fake_event_hub_input_configuration.h"
29
#include "mir_test/fake_event_hub_input_configuration.h"
351
@@ -416,6 +417,39 @@
352
416
    });
417
    });
353
417
}
418
}
354
418
419
355
420
TEST_F(ServerShutdown, server_removes_endpoint_on_mir_abort)
356
421
{   // Even fatal errors sometimes need to be caught for critical cleanup...
357
422
    struct ServerConfig : TestingServerConfiguration
358
423
    {
359
424
        void on_start() override
360
425
        {
361
426
            sync.wait_for_signal_ready_for();
362
427
            mir::abort("Bang");
363
428
        }
364
429
365
430
        mtf::CrossProcessSync sync;
366
431
    };
367
432
368
433
    ServerConfig server_config;
369
434
    launch_server_process(server_config);
370
435
371
436
    run_in_test_process([&]
372
437
    {
373
438
        ASSERT_TRUE(file_exists(server_config.the_socket_file()));
374
439
375
440
        server_config.sync.signal_ready();
376
441
377
442
        auto result = wait_for_shutdown_server_process();
378
443
        EXPECT_EQ(mtf::TerminationReason::child_terminated_by_signal, result.reason);
379
444
        // Under valgrind the server process is reported as being terminated
380
445
        // by SIGKILL because of multithreading madness.
381
446
        // TODO: Investigate if we can do better than this workaround
382
447
        EXPECT_TRUE(result.signal == SIGABRT || result.signal == SIGKILL);
383
448
384
449
        EXPECT_FALSE(file_exists(server_config.the_socket_file()));
385
450
    });
386
451
}
387
452
388
419
struct OnSignal : ServerShutdown, ::testing::WithParamInterface<int> {};
453
struct OnSignal : ServerShutdown, ::testing::WithParamInterface<int> {};
389
420
454
390
421
TEST_P(OnSignal, removes_endpoint_on_signal)
455
TEST_P(OnSignal, removes_endpoint_on_signal)
391
422
456
392
=== modified file 'tests/unit-tests/CMakeLists.txt'
393
--- tests/unit-tests/CMakeLists.txt	2014-07-11 21:53:44 +0000
394
+++ tests/unit-tests/CMakeLists.txt	2014-07-14 06:58:31 +0000
395
@@ -20,6 +20,7 @@
396
20
  test_thread_name.cpp
20
  test_thread_name.cpp
397
21
  test_default_emergency_cleanup.cpp
21
  test_default_emergency_cleanup.cpp
398
22
  test_basic_observers.cpp
22
  test_basic_observers.cpp
399
23
  test_fatal.cpp
400
23
)
24
)
401
24
25
402
25
add_subdirectory(options/)
26
add_subdirectory(options/)
403
@@ -50,6 +51,7 @@
404
50
  mirdraw
51
  mirdraw
405
51
  mirtestdraw
52
  mirtestdraw
406
52
  mirlogging
53
  mirlogging
407
54
  mirfatal
408
53
55
409
54
  mir-test
56
  mir-test
410
55
  mir-test-doubles
57
  mir-test-doubles
411
56
58
412
=== modified file 'tests/unit-tests/graphics/mesa/test_display.cpp'
413
--- tests/unit-tests/graphics/mesa/test_display.cpp	2014-06-23 16:29:17 +0000
414
+++ tests/unit-tests/graphics/mesa/test_display.cpp	2014-07-14 06:58:31 +0000
415
@@ -450,39 +450,39 @@
416
450
{
450
{
417
451
    using namespace testing;
451
    using namespace testing;
418
452
452
445
453
    auto const crtc_id = get_connected_crtc_id();
453
    EXPECT_DEATH(
446
454
454
    {
447
455
    setup_post_update_expectations();
455
        auto const crtc_id = get_connected_crtc_id();
448
456
456
    
449
457
    {
457
        setup_post_update_expectations();
450
458
        InSequence s;
458
    
451
459
459
        {
452
460
        /* New FB flip failure */
460
            InSequence s;
453
461
        EXPECT_CALL(mock_drm, drmModePageFlip(mock_drm.fake_drm.fd(),
461
    
454
462
                                              crtc_id,
462
            /* New FB flip failure */
455
463
                                              fake.fb_id2,
463
            EXPECT_CALL(mock_drm, drmModePageFlip(mock_drm.fake_drm.fd(),
456
464
                                              _, _))
464
                                                  crtc_id,
457
465
            .Times(Exactly(1))
465
                                                  fake.fb_id2,
458
466
            .WillOnce(Return(-1));
466
                                                  _, _))
459
467
467
                .Times(Exactly(1))
460
468
        /* Release failed bufobj */
468
                .WillOnce(Return(-1));
461
469
        EXPECT_CALL(mock_gbm, gbm_surface_release_buffer(mock_gbm.fake_gbm.surface, fake.bo2))
469
    
462
470
            .Times(Exactly(1));
470
            /* Release failed bufobj */
463
471
471
            EXPECT_CALL(mock_gbm, gbm_surface_release_buffer(mock_gbm.fake_gbm.surface, fake.bo2))
464
472
        /* Release scheduled_bufobj (at destruction time) */
472
                .Times(Exactly(1));
465
473
        EXPECT_CALL(mock_gbm, gbm_surface_release_buffer(mock_gbm.fake_gbm.surface, fake.bo1))
473
    
466
474
            .Times(Exactly(1));
474
            /* Release scheduled_bufobj (at destruction time) */
467
475
    }
475
            EXPECT_CALL(mock_gbm, gbm_surface_release_buffer(mock_gbm.fake_gbm.surface, fake.bo1))
468
476
476
                .Times(Exactly(1));
469
477
    EXPECT_THROW(
477
        }
470
478
    {
478
    
471
479
        auto display = create_display(create_platform());
479
        auto display = create_display(create_platform());
472
480
480
473
481
        display->for_each_display_buffer([](mg::DisplayBuffer& db)
481
        display->for_each_display_buffer([](mg::DisplayBuffer& db)
474
482
        {
482
        {
475
483
            db.post_update();
483
            db.post_update();
476
484
        });
484
        });
478
485
    }, std::runtime_error);
485
    }, "Mir fatal error: Failed to schedule page flip");
479
486
}
486
}
480
487
487
481
488
TEST_F(MesaDisplayTest, successful_creation_of_display_reports_successful_setup_of_native_resources)
488
TEST_F(MesaDisplayTest, successful_creation_of_display_reports_successful_setup_of_native_resources)
482
489
489
483
=== modified file 'tests/unit-tests/graphics/mesa/test_real_kms_output.cpp'
484
--- tests/unit-tests/graphics/mesa/test_real_kms_output.cpp	2014-03-06 06:05:17 +0000
485
+++ tests/unit-tests/graphics/mesa/test_real_kms_output.cpp	2014-07-14 06:58:31 +0000
486
@@ -23,7 +23,7 @@
487
23
23
488
24
#include "mir_test_doubles/mock_drm.h"
24
#include "mir_test_doubles/mock_drm.h"
489
25
25
491
26
#include <stdexcept>
26
#include <csignal>
492
27
27
493
28
#include <gtest/gtest.h>
28
#include <gtest/gtest.h>
494
29
#include <gmock/gmock.h>
29
#include <gmock/gmock.h>
495
@@ -227,12 +227,15 @@
496
227
                              mt::fake_shared(mock_page_flipper)};
227
                              mt::fake_shared(mock_page_flipper)};
497
228
228
498
229
    EXPECT_FALSE(output.set_crtc(fb_id));
229
    EXPECT_FALSE(output.set_crtc(fb_id));
505
230
    EXPECT_THROW({
230
506
231
        output.schedule_page_flip(fb_id);
231
    EXPECT_EXIT({output.schedule_page_flip(fb_id);},
507
232
    }, std::runtime_error);
232
                KilledBySignal(SIGABRT),
508
233
    EXPECT_THROW({
233
                "Mir fatal error: Output VGA-0 has no associated CRTC to schedule page flips on");
509
234
        output.wait_for_page_flip();
234
510
235
    }, std::runtime_error);
235
    // Yes, gtest is so awesome we can die multiple times...
511
236
    EXPECT_EXIT({output.wait_for_page_flip();},
512
237
                KilledBySignal(SIGABRT),
513
238
                "Mir fatal error: Output VGA-0 has no associated CRTC to wait on");
514
236
}
239
}
515
237
240
516
238
TEST_F(RealKMSOutputTest, clear_crtc_gets_crtc_if_none_is_current)
241
TEST_F(RealKMSOutputTest, clear_crtc_gets_crtc_if_none_is_current)
517
@@ -285,11 +288,10 @@
518
285
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
288
    mgm::RealKMSOutput output{mock_drm.fake_drm.fd(), connector_ids[0],
519
286
                              mt::fake_shared(mock_page_flipper)};
289
                              mt::fake_shared(mock_page_flipper)};
520
287
290
524
288
    EXPECT_CALL(mock_drm, drmModeSetCrtc(_, crtc_ids[0], 0, 0, 0, nullptr, 0, nullptr))
291
    ON_CALL(mock_drm, drmModeSetCrtc(_, crtc_ids[0], 0, 0, 0, nullptr, 0, nullptr))
525
289
        .Times(1)
292
        .WillByDefault(Return(-1));
523
290
        .WillOnce(Return(-1));
526
291
293
530
292
    EXPECT_THROW({
294
    EXPECT_EXIT({output.clear_crtc();},
531
293
        output.clear_crtc();
295
                KilledBySignal(SIGABRT),
532
294
    }, std::runtime_error);
296
                "Mir fatal error: Couldn't clear output VGA-0 \\(drmModeSetCrtc = -1\\)");
533
295
}
297
}
534
296
298
535
=== added file 'tests/unit-tests/test_fatal.cpp'
536
--- tests/unit-tests/test_fatal.cpp	1970-01-01 00:00:00 +0000
537
+++ tests/unit-tests/test_fatal.cpp	2014-07-14 06:58:31 +0000
538
@@ -0,0 +1,49 @@
539
1
/*
540
2
 * Copyright © 2014 Canonical Ltd.
541
3
 *
542
4
 * This program is free software: you can redistribute it and/or modify it
543
5
 * under the terms of the GNU General Public License version 3,
544
6
 * as published by the Free Software Foundation.
545
7
 *
546
8
 * This program is distributed in the hope that it will be useful,
547
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
548
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
549
11
 * GNU General Public License for more details.
550
12
 *
551
13
 * You should have received a copy of the GNU General Public License
552
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
553
15
 *
554
16
 * Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
555
17
 */
556
18
557
19
#include "mir/fatal.h"
558
20
#include <gtest/gtest.h>
559
21
#include <csignal>
560
22
561
23
using namespace testing;
562
24
563
25
TEST(FatalTest, abort_formats_message_to_stderr)
564
26
{
565
27
    EXPECT_DEATH({mir::abort("%s had %d %s %s", "Mary", 1, "little", "lamb");},
566
28
                 "Mary had 1 little lamb");
567
29
}
568
30
569
31
TEST(FatalTest, abort_raises_sigabrt)
570
32
{
571
33
    EXPECT_EXIT({mir::abort("Hello world");},
572
34
                KilledBySignal(SIGABRT),
573
35
                "Hello world");
574
36
}
575
37
576
38
TEST(FatalTest, true_assertion_raises_nothing)
577
39
{
578
40
    mir_assert(1 + 1 == 2);
579
41
}
580
42
581
43
TEST(FatalTest, false_assertion_emits_message_and_aborts)
582
44
{
583
45
    EXPECT_EXIT({mir_assert(2+2==5);},
584
46
                KilledBySignal(SIGABRT),
585
47
                "Mir fatal error: Assertion failed at .* 2\\+2==5");
586
48
}
587
49
Reviewer	Review Type	Date Requested	Status
Cemil Azizoglu (community)			Disapprove on 2014-07-22
Robert Carr (community)			Needs Fixing on 2014-07-21
Alexandros Frantzis (community)		2014-05-14	Needs Fixing on 2014-07-21
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-14
Alan Griffiths		2014-05-20	Needs Fixing on 2014-07-09
Chris Halse Rogers		2014-07-02	Approve on 2014-07-07
Gerry Boland (community)		2014-06-06	Needs Information on 2014-06-06
Michał Sawicz		2014-06-06	Pending
Review via email: mp+219471@code.launchpad.net