diff options
| author | Bryce W. Harrington <b.harrington@samsung.com> | 2013-09-08 20:10:03 +0000 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2013-09-09 21:25:12 +0200 |
| commit | f9dcd07d22a5269bf799317a36bb2887d8f9af64 (patch) | |
| tree | 42bab64d56c64a19469d410d8b83a287a05c83c3 /test/ps-features.c | |
| parent | be7f1ac98f62669743f381df8845886d29a9f7f4 (diff) | |
| download | cairo-f9dcd07d22a5269bf799317a36bb2887d8f9af64.tar.gz | |
test: Ensure output dirs exist, falling back to current dir if needed
This change makes several tests behave more like ps-eps.c, et al by
making them attempt to mkdir "output", and in case of trouble use "."
instead. filenames are now allocated at runtime due to this change, so
ensure the corresponding free()'s are in place as well.
This should facilitate running the test suite with a relative path
outside cairo's source tree, such as when employing the CAIRO_REF_DIR
environment variable.
Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'test/ps-features.c')
| -rw-r--r-- | test/ps-features.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/ps-features.c b/test/ps-features.c index 2eb9acea5..fe5de42fa 100644 --- a/test/ps-features.c +++ b/test/ps-features.c @@ -91,9 +91,10 @@ preamble (cairo_test_context_t *ctx) cairo_surface_t *surface; cairo_t *cr; cairo_status_t status; - const char *filename; size_t i; char dsc[255]; + char *filename; + const char *path = cairo_test_mkdir (CAIRO_TEST_OUTPUT_DIR) ? CAIRO_TEST_OUTPUT_DIR : "."; if (! (cairo_test_is_target_enabled (ctx, "ps2") || cairo_test_is_target_enabled (ctx, "ps3"))) @@ -101,8 +102,7 @@ preamble (cairo_test_context_t *ctx) return CAIRO_TEST_UNTESTED; } - filename = CAIRO_TEST_OUTPUT_DIR "/" BASENAME ".ps"; - + xasprintf (&filename, "%s/%s.ps", path, BASENAME); /* We demonstrate that the initial size doesn't matter (we're * passing 0,0), if we use cairo_ps_surface_set_size on the first * page. */ @@ -149,10 +149,12 @@ preamble (cairo_test_context_t *ctx) if (status) { cairo_test_log (ctx, "Failed to create ps surface for file %s: %s\n", filename, cairo_status_to_string (status)); + free (filename); return CAIRO_TEST_FAILURE; } printf ("ps-features: Please check %s to ensure it looks/prints correctly.\n", filename); + free (filename); return CAIRO_TEST_SUCCESS; } |