summaryrefslogtreecommitdiff
path: root/test/ps-eps.c
diff options
context:
space:
mode:
authorBryce W. Harrington <b.harrington@samsung.com>2013-09-08 20:10:03 +0000
committerUli Schlachter <psychon@znc.in>2013-09-09 21:25:12 +0200
commitf9dcd07d22a5269bf799317a36bb2887d8f9af64 (patch)
tree42bab64d56c64a19469d410d8b83a287a05c83c3 /test/ps-eps.c
parentbe7f1ac98f62669743f381df8845886d29a9f7f4 (diff)
downloadcairo-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-eps.c')
-rw-r--r--test/ps-eps.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/test/ps-eps.c b/test/ps-eps.c
index 196146389..66224e20e 100644
--- a/test/ps-eps.c
+++ b/test/ps-eps.c
@@ -239,31 +239,13 @@ check_bbox (cairo_test_context_t *ctx,
return TRUE;
}
-static cairo_bool_t
-_cairo_test_mkdir (const char *path)
-{
-#if ! HAVE_MKDIR
- return FALSE;
-#elif HAVE_MKDIR == 1
- if (mkdir (path) == 0)
- return TRUE;
-#elif HAVE_MKDIR == 2
- if (mkdir (path, 0770) == 0)
- return TRUE;
-#else
-#error Bad value for HAVE_MKDIR
-#endif
-
- return errno == EEXIST;
-}
-
static cairo_test_status_t
preamble (cairo_test_context_t *ctx)
{
cairo_t *cr;
cairo_test_status_t ret = CAIRO_TEST_UNTESTED;
- const char *path = _cairo_test_mkdir (CAIRO_TEST_OUTPUT_DIR) ? CAIRO_TEST_OUTPUT_DIR : ".";
unsigned int i;
+ const char *path = cairo_test_mkdir (CAIRO_TEST_OUTPUT_DIR) ? CAIRO_TEST_OUTPUT_DIR : ".";
for (i = 0; i < ctx->num_targets; i++) {
const cairo_boilerplate_target_t *target = ctx->targets_to_test[i];