tests: Use test-desktop-shell more widely
There's no need to spin up the full desktop-shell for the vast majority of our tests. Rework them to use weston-test-desktop-shell, which is more lightweight and sensible. Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
parent
1b837b6ff3
commit
c129bda562
@ -42,6 +42,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
|
@ -35,6 +35,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
|
@ -38,6 +38,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
|
@ -40,6 +40,8 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
/* We need to use the pixman renderer, since a few of the tests depend
|
||||
* on the renderer holding onto a surface buffer until the next one
|
||||
* is committed, which the noop renderer doesn't do. */
|
||||
|
@ -40,6 +40,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_plugin(harness, &setup);
|
||||
}
|
||||
|
@ -39,6 +39,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
|
@ -45,6 +45,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
|
@ -40,6 +40,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
setup.logging_scopes = "log,proto,test-harness-plugin";
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
|
@ -39,6 +39,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
|
@ -40,6 +40,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_plugin(harness, &setup);
|
||||
}
|
||||
|
@ -39,6 +39,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_plugin(harness, &setup);
|
||||
}
|
||||
|
@ -39,6 +39,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
|
@ -42,6 +42,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
|
@ -50,6 +50,7 @@ fixture_setup(struct weston_test_harness *harness)
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
setup.xwayland = true;
|
||||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
|
Loading…
Reference in New Issue
Block a user