tests/gem_cacheing: convert to subtest infrastructure

This commit is contained in:
Daniel Vetter 2012-11-28 11:41:33 +01:00
parent 3cca0d8c6d
commit 792a05a0a1
2 changed files with 14 additions and 8 deletions

View File

@ -14,6 +14,7 @@ endif
TESTS_progs_M = \ TESTS_progs_M = \
gem_basic \ gem_basic \
gem_cacheing \
flip_test \ flip_test \
$(NULL) $(NULL)
@ -21,7 +22,6 @@ TESTS_progs = \
getversion \ getversion \
getclient \ getclient \
getstats \ getstats \
gem_cacheing \
gem_cpu_concurrent_blit \ gem_cpu_concurrent_blit \
gem_cs_tlb \ gem_cs_tlb \
gem_gtt_concurrent_blit \ gem_gtt_concurrent_blit \

View File

@ -110,6 +110,9 @@ int main(int argc, char **argv)
int i, j; int i, j;
uint8_t *cpu_ptr; uint8_t *cpu_ptr;
uint8_t *gtt_ptr; uint8_t *gtt_ptr;
bool skipped_all = true;
drmtest_subtest_init(argc, argv);
srandom(0xdeadbeef); srandom(0xdeadbeef);
@ -129,9 +132,6 @@ int main(int argc, char **argv)
flags = 0; flags = 0;
} }
if (flags == 0)
return 77;
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
batch = intel_batchbuffer_alloc(bufmgr, devid); batch = intel_batchbuffer_alloc(bufmgr, devid);
@ -144,8 +144,10 @@ int main(int argc, char **argv)
drmtest_init_aperture_trashers(bufmgr); drmtest_init_aperture_trashers(bufmgr);
mappable_gtt_limit = gem_mappable_aperture_size(); mappable_gtt_limit = gem_mappable_aperture_size();
if (flags & TEST_READ) { if (drmtest_run_subtest("reads") && (flags & TEST_READ)) {
printf("checking partial reads\n"); printf("checking partial reads\n");
skipped_all = false;
for (i = 0; i < ROUNDS; i++) { for (i = 0; i < ROUNDS; i++) {
uint8_t val0 = i; uint8_t val0 = i;
int start, len; int start, len;
@ -170,8 +172,10 @@ int main(int argc, char **argv)
} }
} }
if (flags & TEST_WRITE) { if (drmtest_run_subtest("writes") && (flags & TEST_WRITE)) {
printf("checking partial writes\n"); printf("checking partial writes\n");
skipped_all = false;
for (i = 0; i < ROUNDS; i++) { for (i = 0; i < ROUNDS; i++) {
uint8_t val0 = i, val1; uint8_t val0 = i, val1;
int start, len; int start, len;
@ -218,8 +222,10 @@ int main(int argc, char **argv)
} }
} }
if ((flags & TEST_BOTH) == TEST_BOTH) { if (drmtest_run_subtest("read-writes") && (flags & TEST_BOTH) == TEST_BOTH) {
printf("checking partial writes after partial reads\n"); printf("checking partial writes after partial reads\n");
skipped_all = false;
for (i = 0; i < ROUNDS; i++) { for (i = 0; i < ROUNDS; i++) {
uint8_t val0 = i, val1, val2; uint8_t val0 = i, val1, val2;
int start, len; int start, len;
@ -292,5 +298,5 @@ int main(int argc, char **argv)
close(fd); close(fd);
return 0; return skipped_all ? 77 : 0;
} }