[cairo] [PATCH v3 3/7] test: Use CAIRO_TEST_OUTPUT_DIR for name of the output directory
Bryce W. Harrington
b.harrington at samsung.com
Thu Aug 15 11:08:37 PDT 2013
Thanks to Uli Schlachter for the suggestion
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
---
test/create-for-stream.c | 2 +-
test/multi-page.c | 2 +-
test/pdf-features.c | 2 +-
test/pdf-mime-data.c | 2 +-
test/pdf-surface-source.c | 2 +-
test/png.c | 2 +-
test/ps-features.c | 2 +-
test/ps-surface-source.c | 2 +-
test/svg-clip.c | 2 +-
test/svg-surface-source.c | 2 +-
test/svg-surface.c | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/create-for-stream.c b/test/create-for-stream.c
index fdd4e01..403f947 100644
--- a/test/create-for-stream.c
+++ b/test/create-for-stream.c
@@ -57,7 +57,7 @@
#define WIDTH_IN_POINTS (WIDTH_IN_INCHES * 72.0)
#define HEIGHT_IN_POINTS (HEIGHT_IN_INCHES * 72.0)
-#define BASENAME "output/create-for-stream.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/create-for-stream.out"
static cairo_test_status_t
draw (cairo_t *cr, int width, int height)
diff --git a/test/multi-page.c b/test/multi-page.c
index 95741d3..7894a33 100644
--- a/test/multi-page.c
+++ b/test/multi-page.c
@@ -51,7 +51,7 @@
#define HEIGHT_IN_INCHES 3
#define WIDTH_IN_POINTS (WIDTH_IN_INCHES * 72.0)
#define HEIGHT_IN_POINTS (HEIGHT_IN_INCHES * 72.0)
-#define BASENAME "output/multi-page.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/multi-page.out"
static void
draw_smiley (cairo_t *cr, double width, double height, double smile_ratio)
diff --git a/test/pdf-features.c b/test/pdf-features.c
index 5f167f7..669d2ce 100644
--- a/test/pdf-features.c
+++ b/test/pdf-features.c
@@ -39,7 +39,7 @@
#define INCHES_TO_POINTS(in) ((in) * 72.0)
#define MM_TO_POINTS(mm) ((mm) / 25.4 * 72.0)
#define TEXT_SIZE 12
-#define BASENAME "output/pdf-features.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/pdf-features.out"
static struct {
const char *page_size;
diff --git a/test/pdf-mime-data.c b/test/pdf-mime-data.c
index 9d7d36f..bbe1a15 100644
--- a/test/pdf-mime-data.c
+++ b/test/pdf-mime-data.c
@@ -39,7 +39,7 @@
* are not using a jpeg library */
#define IMAGE_FILE "romedalen"
-#define BASENAME "output/pdf-mime-data.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/pdf-mime-data.out"
static cairo_test_status_t
read_file (const cairo_test_context_t *ctx,
diff --git a/test/pdf-surface-source.c b/test/pdf-surface-source.c
index 13cdd08..52f97af 100644
--- a/test/pdf-surface-source.c
+++ b/test/pdf-surface-source.c
@@ -28,7 +28,7 @@
#include "surface-source.c"
-#define BASENAME "output/pdf-surface-source.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/pdf-surface-source.out"
static cairo_surface_t *
create_source_surface (int size)
diff --git a/test/png.c b/test/png.c
index d58c030..32460fc 100644
--- a/test/png.c
+++ b/test/png.c
@@ -30,7 +30,7 @@
/* Test the idempotency of write_png->read_png */
#define RGB_MASK 0x00ffffff
-#define BASENAME "output/png.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/png.out"
static cairo_bool_t
image_surface_equals (cairo_surface_t *A, cairo_surface_t *B)
diff --git a/test/ps-features.c b/test/ps-features.c
index c8545ee..ea19e93 100644
--- a/test/ps-features.c
+++ b/test/ps-features.c
@@ -42,7 +42,7 @@
#define INCHES_TO_POINTS(in) ((in) * 72.0)
#define MM_TO_POINTS(mm) ((mm) / 25.4 * 72.0)
#define TEXT_SIZE 12
-#define BASENAME "output/ps-features.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/ps-features.out"
static struct {
const char *page_size;
diff --git a/test/ps-surface-source.c b/test/ps-surface-source.c
index 7c5c5aa..dfb371e 100644
--- a/test/ps-surface-source.c
+++ b/test/ps-surface-source.c
@@ -28,7 +28,7 @@
#include "surface-source.c"
-#define BASENAME "output/ps-surface-source.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/ps-surface-source.out"
static cairo_surface_t *
create_source_surface (int size)
diff --git a/test/svg-clip.c b/test/svg-clip.c
index d02c69e..51f099f 100644
--- a/test/svg-clip.c
+++ b/test/svg-clip.c
@@ -32,7 +32,7 @@
#define WIDTH_IN_POINTS 600
#define HEIGHT_IN_POINTS 600
-#define BASENAME "output/svg-clip.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/svg-clip.out"
static void
test_clip (cairo_t *cr, double width, double height)
diff --git a/test/svg-surface-source.c b/test/svg-surface-source.c
index 64b7f86..6ef5400 100644
--- a/test/svg-surface-source.c
+++ b/test/svg-surface-source.c
@@ -28,7 +28,7 @@
#include "surface-source.c"
-#define BASENAME "output/svg-surface-source.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/svg-surface-source.out"
static cairo_surface_t *
create_source_surface (int size)
diff --git a/test/svg-surface.c b/test/svg-surface.c
index 59d67ad..3216069 100644
--- a/test/svg-surface.c
+++ b/test/svg-surface.c
@@ -37,7 +37,7 @@
#define HEIGHT_IN_INCHES 3
#define WIDTH_IN_POINTS (WIDTH_IN_INCHES * 72)
#define HEIGHT_IN_POINTS (HEIGHT_IN_INCHES * 72)
-#define BASENAME "output/svg-surface.out"
+#define BASENAME CAIRO_TEST_OUTPUT_DIR "/svg-surface.out"
static cairo_test_status_t
draw (cairo_t *cr, int width, int height)
--
1.7.9.5
More information about the cairo
mailing list