← Back to branch summary

~raof/mir/prober-drm-device-probe

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/test_graphics_platform.cpp

  • Committer: Christopher James Halse Rogers
  • Date: 2013-07-01 07:32:26 UTC
  • mfrom: (761.1.32 trunk)
  • Revision ID: raof@ubuntu.com-20130701073226-vqc2vq8jhe98v1vh
Merge trunk, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/test_graphics_platform.cpp
32
32
#endif
33
33
#include "mir/graphics/buffer_initializer.h"
34
34
#include "mir/logging/dumb_console_logger.h"
 
35
#include "mir/options/program_option.h"
35
36
 
36
37
#include "mir/graphics/null_display_report.h"
37
38
 
42
43
namespace ml = mir::logging;
43
44
namespace geom = mir::geometry;
44
45
namespace mtd = mir::test::doubles;
 
46
namespace mo = mir::options;
45
47
 
46
48
class GraphicsPlatform : public ::testing::Test
47
49
{
75
77
    std::shared_ptr<mg::Platform> create_platform()
76
78
    {
77
79
#ifdef ANDROID
78
 
        return mg::create_platform(std::make_shared<mg::NullDisplayReport>());
 
80
        return mg::create_platform(std::make_shared<mo::ProgramOption>(), std::make_shared<mg::NullDisplayReport>());
79
81
#else
80
82
        return std::make_shared<mg::gbm::GBMPlatform>(
81
83
            std::make_shared<mg::NullDisplayReport>(),