← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

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

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/test_graphics_platform.cpp
24
24
#include "mir_test/gl_mock.h"
25
25
#ifndef ANDROID
26
26
#include "mir_test_doubles/mock_drm.h"
27
 
#include "gbm/mock_gbm.h"
 
27
#include "mir_test_doubles/mock_gbm.h"
28
28
#include "mir_test_doubles/null_virtual_terminal.h"
29
29
#include "src/server/graphics/gbm/gbm_platform.h"
30
30
#else
92
92
    ::testing::NiceMock<mir::test::HardwareAccessMock> hw_access_mock;
93
93
#else
94
94
    ::testing::NiceMock<mtd::MockDRM> mock_drm;
95
 
    ::testing::NiceMock<mg::gbm::MockGBM> mock_gbm;
 
95
    ::testing::NiceMock<mtd::MockGBM> mock_gbm;
96
96
#endif
97
97
};
98
98