tests/gem_readwrite: convert to subtests

A bit lazy since the read/write tests are all smashed together. But
since we have really evil partial write/read tests for coherency
checking that doesn't matter that much really.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-08-13 12:45:14 +02:00
parent ef9e64577d
commit 907377da0e
2 changed files with 47 additions and 36 deletions

View File

@ -36,6 +36,7 @@ TESTS_progs_M = \
gem_prw_concurrent_blit \ gem_prw_concurrent_blit \
gem_pwrite \ gem_pwrite \
gem_pwrite_pread \ gem_pwrite_pread \
gem_readwrite \
gem_ringfill \ gem_ringfill \
gem_set_tiling_vs_blt \ gem_set_tiling_vs_blt \
gem_suspend \ gem_suspend \
@ -76,7 +77,6 @@ TESTS_progs = \
gem_mmap_offset_exhaustion \ gem_mmap_offset_exhaustion \
gem_pin \ gem_pin \
gem_pipe_control_store_loop \ gem_pipe_control_store_loop \
gem_readwrite \
gem_reg_read \ gem_reg_read \
gem_reloc_overflow \ gem_reloc_overflow \
gem_reloc_vs_gpu \ gem_reloc_vs_gpu \

View File

@ -82,52 +82,63 @@ int main(int argc, char **argv)
int handle; int handle;
igt_skip_on_simulation(); igt_skip_on_simulation();
igt_subtest_init(argc, argv);
fd = drm_open_any(); fd = drm_open_any();
handle = gem_create(fd, OBJECT_SIZE); handle = gem_create(fd, OBJECT_SIZE);
printf("Testing contents of newly created object.\n"); igt_subtest("new-obj") {
ret = do_read(fd, handle, buf, 0, OBJECT_SIZE); printf("Testing contents of newly created object.\n");
igt_assert(ret == 0); ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
memset(&expected, 0, sizeof(expected)); igt_assert(ret == 0);
igt_assert(memcmp(expected, buf, sizeof(expected)) == 0); memset(&expected, 0, sizeof(expected));
igt_assert(memcmp(expected, buf, sizeof(expected)) == 0);
}
printf("Testing read beyond end of buffer.\n"); igt_subtest("beyond-EOB") {
ret = do_read(fd, handle, buf, OBJECT_SIZE / 2, OBJECT_SIZE); printf("Testing read beyond end of buffer.\n");
igt_assert(ret == -1 && errno == EINVAL); ret = do_read(fd, handle, buf, OBJECT_SIZE / 2, OBJECT_SIZE);
igt_assert(ret == -1 && errno == EINVAL);
}
printf("Testing full write of buffer\n"); igt_subtest("read-write") {
memset(buf, 0, sizeof(buf)); printf("Testing full write of buffer\n");
memset(buf + 1024, 0x01, 1024); memset(buf, 0, sizeof(buf));
memset(expected + 1024, 0x01, 1024); memset(buf + 1024, 0x01, 1024);
ret = do_write(fd, handle, buf, 0, OBJECT_SIZE); memset(expected + 1024, 0x01, 1024);
igt_assert(ret == 0); ret = do_write(fd, handle, buf, 0, OBJECT_SIZE);
ret = do_read(fd, handle, buf, 0, OBJECT_SIZE); igt_assert(ret == 0);
igt_assert(ret == 0); ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
igt_assert(memcmp(buf, expected, sizeof(buf)) == 0); igt_assert(ret == 0);
igt_assert(memcmp(buf, expected, sizeof(buf)) == 0);
printf("Testing partial write of buffer\n"); printf("Testing partial write of buffer\n");
memset(buf + 4096, 0x02, 1024); memset(buf + 4096, 0x02, 1024);
memset(expected + 4096, 0x02, 1024); memset(expected + 4096, 0x02, 1024);
ret = do_write(fd, handle, buf + 4096, 4096, 1024); ret = do_write(fd, handle, buf + 4096, 4096, 1024);
igt_assert(ret == 0); igt_assert(ret == 0);
ret = do_read(fd, handle, buf, 0, OBJECT_SIZE); ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
igt_assert(ret == 0); igt_assert(ret == 0);
igt_assert(memcmp(buf, expected, sizeof(buf)) == 0); igt_assert(memcmp(buf, expected, sizeof(buf)) == 0);
printf("Testing partial read of buffer\n"); printf("Testing partial read of buffer\n");
ret = do_read(fd, handle, buf, 512, 1024); ret = do_read(fd, handle, buf, 512, 1024);
igt_assert(ret == 0); igt_assert(ret == 0);
igt_assert(memcmp(buf, expected + 512, 1024) == 0); igt_assert(memcmp(buf, expected + 512, 1024) == 0);
}
printf("Testing read of bad buffer handle\n"); igt_subtest("read-bad-handle") {
ret = do_read(fd, 1234, buf, 0, 1024); printf("Testing read of bad buffer handle\n");
igt_assert(ret == -1 && errno == ENOENT); ret = do_read(fd, 1234, buf, 0, 1024);
igt_assert(ret == -1 && errno == ENOENT);
}
printf("Testing write of bad buffer handle\n"); igt_subtest("write-bad-handle") {
ret = do_write(fd, 1234, buf, 0, 1024); printf("Testing write of bad buffer handle\n");
igt_assert(ret == -1 && errno == ENOENT); ret = do_write(fd, 1234, buf, 0, 1024);
igt_assert(ret == -1 && errno == ENOENT);
}
close(fd); close(fd);