diff options
| -rw-r--r-- | test/cairo-test.c | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/test/cairo-test.c b/test/cairo-test.c index 029002bc0..80f64adba 100644 --- a/test/cairo-test.c +++ b/test/cairo-test.c @@ -532,8 +532,10 @@ static cairo_test_status_t cairo_test_expecting (cairo_test_t *test, cairo_test_draw_function_t draw, cairo_test_status_t expectation) { - int i; + int i, num_targets; + char *tname; cairo_test_status_t status, ret; + cairo_test_target_t **targets_to_test; cairo_test_target_t targets[] = { { "image", create_image_surface, cleanup_image}, @@ -554,6 +556,28 @@ cairo_test_expecting (cairo_test_t *test, cairo_test_draw_function_t draw, #endif }; + if ((tname = getenv ("CAIRO_TEST_TARGET")) != NULL) { + num_targets = 0; + targets_to_test = NULL; + /* realloc isn't exactly the best thing here, but meh. */ + for (i = 0; i < sizeof(targets)/sizeof(targets[0]); i++) { + if (strcmp (targets[i].name, tname) == 0) { + targets_to_test = realloc (targets_to_test, sizeof(cairo_test_target_t *) * (num_targets+1)); + targets_to_test[num_targets++] = &targets[i]; + } + } + + if (num_targets == 0) { + fprintf (stderr, "CAIRO_TEST_TARGET '%s' not found in targets list!\n", tname); + exit(-1); + } + } else { + num_targets = sizeof(targets)/sizeof(targets[0]); + targets_to_test = malloc (sizeof(cairo_test_target_t*) * num_targets); + for (i = 0; i < num_targets; i++) + targets_to_test[i] = &targets[i]; + } + cairo_test_init (test->name); /* The intended logic here is that we return overall SUCCESS @@ -568,26 +592,34 @@ cairo_test_expecting (cairo_test_t *test, cairo_test_draw_function_t draw, * -> SUCCESS */ ret = CAIRO_TEST_UNTESTED; - for (i=0; i < sizeof(targets)/sizeof(targets[0]); i++) { - cairo_test_target_t *target = &targets[i]; + for (i = 0; i < num_targets; i++) { + cairo_test_target_t *target = targets_to_test[i]; cairo_test_log ("Testing %s with %s target\n", test->name, target->name); printf ("%s-%s:\t", test->name, target->name); status = cairo_test_for_target (test, draw, target); + + cairo_test_log ("TEST: %s TARGET: %s RESULT: ", + test->name, target->name); switch (status) { case CAIRO_TEST_SUCCESS: printf ("PASS\n"); + cairo_test_log ("PASS\n"); if (ret == CAIRO_TEST_UNTESTED) ret = CAIRO_TEST_SUCCESS; break; case CAIRO_TEST_UNTESTED: printf ("UNTESTED\n"); + cairo_test_log ("UNTESTED\n"); break; default: case CAIRO_TEST_FAILURE: - if (expectation == CAIRO_TEST_FAILURE) + if (expectation == CAIRO_TEST_FAILURE) { printf ("XFAIL\n"); - else + cairo_test_log ("XFAIL\n"); + } else { printf ("FAIL\n"); + cairo_test_log ("FAIL\n"); + } ret = status; break; } @@ -597,6 +629,8 @@ cairo_test_expecting (cairo_test_t *test, cairo_test_draw_function_t draw, fclose (cairo_test_log_file); + free (targets_to_test); + #if HAVE_FCFINI FcFini (); #endif |