← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/test_nested_mir.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/acceptance-tests/test_nested_mir.cpp
190
190
 
191
191
using TestNestedMir = mtf::BespokeDisplayServerTestFixture;
192
192
 
193
 
// TODO resolve problems running "nested" tests on android and running nested on GBM
 
193
// TODO resolve problems running "nested" tests on android and running nested on MESA
194
194
#ifdef ANDROID
195
 
#define DISABLED_ON_ANDROID_AND_GBM(name) DISABLED_##name
 
195
#define DISABLED_ON_ANDROID_AND_MESA(name) DISABLED_##name
196
196
#else
197
 
#define DISABLED_ON_ANDROID_AND_GBM(name) DISABLED_##name
 
197
#define DISABLED_ON_ANDROID_AND_MESA(name) DISABLED_##name
198
198
#endif
199
199
 
200
 
TEST_F(TestNestedMir, DISABLED_ON_ANDROID_AND_GBM(nested_platform_connects_and_disconnects))
 
200
TEST_F(TestNestedMir, DISABLED_ON_ANDROID_AND_MESA(nested_platform_connects_and_disconnects))
201
201
{
202
202
    struct MyHostServerConfiguration : HostServerConfiguration
203
203
    {
242
242
    EXPECT_FALSE(host_config.my_display.lock()) << "after run_mir() exits the display should be released";
243
243
}
244
244
 
245
 
TEST_F(TestNestedMir, DISABLED_ON_ANDROID_AND_GBM(on_exit_display_objects_should_be_destroyed))
 
245
TEST_F(TestNestedMir, DISABLED_ON_ANDROID_AND_MESA(on_exit_display_objects_should_be_destroyed))
246
246
{
247
247
    struct MyNestedServerConfiguration : NestedServerConfiguration
248
248
    {