tests: add igt_subtest_f for snprintf'ing testnames

Useful when stitching together combinatorial testnames.

v2:
- ## rules are just fun. We need 2 indirections to actually get
  __LINE__ to properly expand.
- Kill stray ; which botched the logic.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2013-08-14 13:47:47 +02:00
parent 1532af19d9
commit 6234658063
3 changed files with 18 additions and 16 deletions
+4 -8
View File
@@ -56,7 +56,7 @@ int fd;
*/
#define COLOR 0xffffffff
static void run_test(int ring, const char *testname)
static void run_test(int ring)
{
uint32_t *ptr;
int i;
@@ -66,8 +66,6 @@ static void run_test(int ring, const char *testname)
if (ring == I915_EXEC_RENDER)
gem_require_ring(fd, I915_EXEC_BLT);
printf("running subtest %s\n", testname);
target_bo = drm_intel_bo_alloc(bufmgr, "target bo", 4096, 4096);
if (!target_bo) {
fprintf(stderr, "failed to alloc target buffer\n");
@@ -194,15 +192,13 @@ int main(int argc, char **argv)
for (i = 0; i < ARRAY_SIZE(tests); i++) {
igt_subtest(tests[i].name)
run_test(tests[i].ring, tests[i].name);
run_test(tests[i].ring);
}
igt_fork_signal_helper();
for (i = 0; i < ARRAY_SIZE(tests); i++) {
char name[180];
snprintf(name, sizeof(name), "%s-interruptible", tests[i].name);
igt_subtest(name)
run_test(tests[i].ring, name);
igt_subtest_f("%s-interruptible", tests[i].name)
run_test(tests[i].ring);
}
igt_stop_signal_helper();