← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/mesa/test_display.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Alberto Aguirre, Ubuntu daily release
  • Date: 2014-11-20 16:41:15 UTC
  • mfrom: (1.1.78)
  • Revision ID: package-import@ubuntu.com-20141120164115-icb4r8ekhfuj1abj
Tags: 0.9.0+15.04.20141120.1-0ubuntu1
https://launchpad.net/bugs/1346633
https://launchpad.net/bugs/1376324
https://launchpad.net/bugs/1378326
https://launchpad.net/bugs/1378740
https://launchpad.net/bugs/1381925
https://launchpad.net/bugs/1386646
https://launchpad.net/bugs/1390388
https://launchpad.net/bugs/1303817
https://launchpad.net/bugs/1377968
https://launchpad.net/bugs/1304873
https://launchpad.net/bugs/1378706
https://launchpad.net/bugs/1378995
https://launchpad.net/bugs/239272
https://launchpad.net/bugs/1386185
https://launchpad.net/bugs/1388539
https://launchpad.net/bugs/1391923
[ Alberto Aguirre ]
* New upstream release 0.9.0 (https://launchpad.net/mir/+milestone/0.9.0)
  - Enhancements:
    . New simpler API to configure and run a mir server.
    . The event loop is now based on GLib's main loop library instead of
      Boost.Asio.
    . For Android platforms, the server now sends buffer fence fds to its
      clients instead of potentially stalling the compositor thread waiting
      for them to be signalled.
    . New client debug interface to translate from surface to screen
      coordinates.
  - ABI summary: Servers need rebuilding, but clients do not;
    . Mirclient ABI unchanged at 8
    . Mircommon ABI bumped to 3
    . Mirplatform ABI bumped to 4
    . Mirserver ABI bumped to 27
  - Bug fixes:
    . Add a debug interface to translate from surface to screen coordinates
      (LP: #1346633)
    . Ensure a buffer requested by a surface is not delivered 
      after the surface is deleted (LP: #1376324)
    . Overlays are not displayed onscreen in some positions (LP: #1378326)
    . Server aborts when an exception is thrown from the main thread
      (LP: #1378740)
    . Fix race causing lost alarm notifications (LP: #1381925)
    . Avoid lifecycle notifications racing with connection release
      (LP: #1386646)
    . Improve error checking and reporting for the client library
     (LP: #1390388)
    . Mir demo-shell now detects power button using proper Linux scan codes
     (LP: #1303817)
    . A prompt session with an invalid application pid should be an error
      (LP: #1377968)
    . When XDG_RUNTIME_DIR is defined but pointing to a non-existing 
      directory use "/tmp" (LP: #1304873)
    . [regression] demo-shell bypass is not used on fullscreen surfaces if 
      there are windowed surfaces behind (LP: #1378706)
    . Mir upgrade through dist-upgrade installs incorrect platform
      (LP: #1378995)
    . Fix Mir progressbar example using internal glibc defines(LP: #239272)
    . Stop the default_lifecycle_event_handler raising SIGHUP while 
      disconnecting (LP: #1386185)
    . [regression] Mir fails to build with MIR_ENABLE_TESTS=OFF (LP: #1388539)
    . [regression] mir_demo_server_basic does not start (LP: #1391923)

[ Ubuntu daily release ]
* New rebuild forced

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/mesa/test_display.cpp
23
23
#include "mir/logging/logger.h"
24
24
#include "mir/graphics/display_buffer.h"
25
25
#include "src/server/graphics/default_display_configuration_policy.h"
26
 
#include "mir/time/high_resolution_clock.h"
27
 
#include "mir/asio_main_loop.h"
 
26
#include "mir/time/steady_clock.h"
 
27
#include "mir/glib_main_loop.h"
28
28
 
29
29
#include "mir_test_doubles/mock_egl.h"
30
30
#include "mir_test_doubles/mock_gl.h"
64
64
struct MockLogger : public ml::Logger
65
65
{
66
66
    MOCK_METHOD3(log,
67
 
                 void(ml::Logger::Severity, const std::string&, const std::string&));
 
67
                 void(ml::Severity, const std::string&, const std::string&));
68
68
 
69
69
    ~MockLogger() noexcept(true) {}
70
70
};
522
522
 
523
523
    EXPECT_CALL(
524
524
        *logger,
525
 
        log(Eq(ml::Logger::informational),
 
525
        log(Eq(ml::Severity::informational),
526
526
            StrEq("Successfully setup native resources."),
527
527
            StrEq("graphics"))).Times(Exactly(1));
528
528
 
538
538
 
539
539
    EXPECT_CALL(
540
540
        *logger,
541
 
        log(Eq(ml::Logger::informational),
 
541
        log(Eq(ml::Severity::informational),
542
542
            StrEq("Successfully made egl context current on construction."),
543
543
            StrEq("graphics"))).Times(Exactly(1));
544
544
 
554
554
 
555
555
    EXPECT_CALL(
556
556
        *logger,
557
 
        log(Eq(ml::Logger::informational),
 
557
        log(Eq(ml::Severity::informational),
558
558
            StrEq("Successfully performed egl buffer swap on construction."),
559
559
            StrEq("graphics"))).Times(Exactly(1));
560
560
 
570
570
 
571
571
    EXPECT_CALL(
572
572
        *logger,
573
 
        log(Eq(ml::Logger::informational),
 
573
        log(Eq(ml::Severity::informational),
574
574
            StrEq("Successfully performed drm mode setup on construction."),
575
575
            StrEq("graphics"))).Times(Exactly(1));
576
576
 
717
717
 
718
718
    auto display = create_display(create_platform());
719
719
 
720
 
    mir::AsioMainLoop ml{std::make_shared<mir::time::HighResolutionClock>()};
 
720
    mir::GLibMainLoop ml{std::make_shared<mir::time::SteadyClock>()};
721
721
    std::condition_variable done;
722
722
 
723
723
    int const device_add_count{1};