diff options
| author | Uri Lublin <uril@redhat.com> | 2013-07-08 19:38:19 +0300 |
|---|---|---|
| committer | Uri Lublin <uril@redhat.com> | 2013-07-16 23:37:27 +0300 |
| commit | 694f4b9e5797af60e1586c2a99c19671483e5b44 (patch) | |
| tree | 67f127b6fb2a3eeff3e2fadbc7199888380ba4fa /server/tests | |
| parent | ff03d8dd2a4827c3b81657a1b9b3c9767481bba2 (diff) | |
server/tests: fix produce_command for create surface
Earlier in this function, test->target_surface is set to 1, which
is the only allowed non-primary surface currently.
If surface parameters are given (and specifically data is checked)
they are being used, otherwise a default surface is used.
Earlier in this function, "command" is set to a non-NULL value.
Thus, the else part was unreachable code, which is fixed now.
Diffstat (limited to 'server/tests')
| -rw-r--r-- | server/tests/test_display_base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/server/tests/test_display_base.c b/server/tests/test_display_base.c index ad2c687e..cf3990f0 100644 --- a/server/tests/test_display_base.c +++ b/server/tests/test_display_base.c @@ -553,8 +553,10 @@ static void produce_command(Test *test) case SIMPLE_CREATE_SURFACE: { SimpleSurfaceCmd *update; - test->target_surface = MAX_SURFACE_NUM - 1; - if (command) { + if (command->create_surface.data) { + ASSERT(command->create_surface.surface_id > 0); + ASSERT(command->create_surface.surface_id < MAX_SURFACE_NUM); + ASSERT(command->create_surface.surface_id == 1); update = create_surface(command->create_surface.surface_id, command->create_surface.format, command->create_surface.width, |