← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-01-08 02:04:38 UTC
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20140108020438-e1npu0pm7qdv5wc4
Tags: upstream-0.1.3+14.04.20140108
Import upstream version 0.1.3+14.04.20140108

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/test_display.cpp
27
27
#include "mir_test_doubles/mock_drm.h"
28
28
#include "mir_test_doubles/mock_gbm.h"
29
29
#include "mir_test_doubles/null_virtual_terminal.h"
30
 
#include "src/server/graphics/gbm/gbm_platform.h"
 
30
#include "src/platform/graphics/mesa/platform.h"
31
31
#include "mir_test_framework/udev_environment.h"
32
32
#else
33
 
#include "src/server/graphics/android/android_platform.h"
 
33
#include "src/platform/graphics/android/android_platform.h"
34
34
#include "mir_test_doubles/mock_android_hw.h"
35
35
#include "mir_test_doubles/mock_display_device.h"
36
36
#endif
77
77
#ifdef ANDROID
78
78
        auto platform = mg::create_platform(
79
79
            std::make_shared<mir::options::ProgramOption>(),
80
 
            report); 
 
80
            report);
81
81
#else
82
 
        auto platform = std::make_shared<mg::gbm::GBMPlatform>(report,
 
82
        auto platform = std::make_shared<mg::mesa::Platform>(report,
83
83
            std::make_shared<mir::test::doubles::NullVirtualTerminal>());
84
84
#endif
85
85
        return platform->create_display(conf_policy);