← Back to branch summary

~albaguirre/mir/test-hack-consume-buffers-display-off

« back to all changes in this revision

Viewing changes to tests/integration-tests/graphics/mesa/test_buffer_integration.cpp

  • Committer: CI bot
  • Author(s): Tarmac, Daniel van Vugt, Kevin Gunn
  • Date: 2014-03-10 19:28:33 UTC
  • mfrom: (1160.196.70 trunk-0.1.6)
  • Revision ID: ps-jenkins@lists.canonical.com-20140310192833-0tjthcchenlofkyv
Latest upstream release of Mir 0.1.6 (lp:~mir-team/mir/development-branch r1433) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration-tests/graphics/mesa/test_buffer_integration.cpp
20
20
#include "mir/graphics/buffer_id.h"
21
21
#include "mir/graphics/buffer_properties.h"
22
22
#include "mir/graphics/buffer_initializer.h"
 
23
#include "mir/options/configuration.h"
 
24
#include "mir/options/option.h"
23
25
#include "mir_test_doubles/stub_buffer.h"
24
26
#include "mir_test_doubles/stub_buffer_allocator.h"
25
27
#include "mir_test_doubles/null_platform.h"
26
 
#include "mir/graphics/null_display_report.h"
27
28
#include "src/server/graphics/default_display_configuration_policy.h"
 
29
#include "src/server/report/null_report_factory.h"
28
30
 
29
31
#include "mir_test_framework/testing_server_configuration.h"
30
32
 
37
39
namespace mg = mir::graphics;
38
40
namespace mtf = mir_test_framework;
39
41
namespace mtd = mir::test::doubles;
 
42
namespace mr = mir::report;
40
43
 
41
44
namespace mir
42
45
{
94
97
        auto options = mtf::TestingServerConfiguration().the_options();
95
98
 
96
99
        if (options->get<bool>("tests-use-real-graphics"))
97
 
            platform = mg::create_platform(options, std::make_shared<mg::NullDisplayReport>());
 
100
            platform = mg::create_platform(options, mr::null_display_report());
98
101
        else
99
102
            platform = std::make_shared<StubGraphicPlatform>();
100
103