diff --git a/backend/tests/test_bmp.c b/backend/tests/test_bmp.c index 62693beb..283d7c8e 100644 --- a/backend/tests/test_bmp.c +++ b/backend/tests/test_bmp.c @@ -142,9 +142,11 @@ static void test_print(int index, int generate, int debug) { int escaped_size = 1024; if (generate) { - if (!testUtilExists(data_dir)) { - ret = testutil_mkdir(data_dir, 0755); - assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir, ret, errno, strerror(errno)); + char data_dir_path[1024]; + assert_nonzero(testUtilDataPath(data_dir_path, sizeof(data_dir_path), data_dir, NULL), "testUtilDataPath(%s) == 0\n", data_dir); + if (!testUtilExists(data_dir_path)) { + ret = testutil_mkdir(data_dir_path, 0755); + assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir_path, ret, errno, strerror(errno)); } } diff --git a/backend/tests/test_emf.c b/backend/tests/test_emf.c index 74e3f853..962c22db 100644 --- a/backend/tests/test_emf.c +++ b/backend/tests/test_emf.c @@ -80,9 +80,11 @@ static void test_print(int index, int generate, int debug) { int escaped_size = 1024; if (generate) { - if (!testUtilExists(data_dir)) { - ret = testutil_mkdir(data_dir, 0755); - assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir, ret, errno, strerror(errno)); + char data_dir_path[1024]; + assert_nonzero(testUtilDataPath(data_dir_path, sizeof(data_dir_path), data_dir, NULL), "testUtilDataPath(%s) == 0\n", data_dir); + if (!testUtilExists(data_dir_path)) { + ret = testutil_mkdir(data_dir_path, 0755); + assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir_path, ret, errno, strerror(errno)); } } diff --git a/backend/tests/test_png.c b/backend/tests/test_png.c index 190c3934..73839cf4 100644 --- a/backend/tests/test_png.c +++ b/backend/tests/test_png.c @@ -196,9 +196,11 @@ static void test_print(int index, int generate, int debug) { char *text; if (generate) { - if (!testUtilExists(data_dir)) { - ret = testutil_mkdir(data_dir, 0755); - assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir, ret, errno, strerror(errno)); + char data_dir_path[1024]; + assert_nonzero(testUtilDataPath(data_dir_path, sizeof(data_dir_path), data_dir, NULL), "testUtilDataPath(%s) == 0\n", data_dir); + if (!testUtilExists(data_dir_path)) { + ret = testutil_mkdir(data_dir_path, 0755); + assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir_path, ret, errno, strerror(errno)); } } diff --git a/backend/tests/test_ps.c b/backend/tests/test_ps.c index a1b347ca..98955abf 100644 --- a/backend/tests/test_ps.c +++ b/backend/tests/test_ps.c @@ -71,9 +71,11 @@ static void test_print(int index, int generate, int debug) { int escaped_size = 1024; if (generate) { - if (!testUtilExists(data_dir)) { - ret = testutil_mkdir(data_dir, 0755); - assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir, ret, errno, strerror(errno)); + char data_dir_path[1024]; + assert_nonzero(testUtilDataPath(data_dir_path, sizeof(data_dir_path), data_dir, NULL), "testUtilDataPath(%s) == 0\n", data_dir); + if (!testUtilExists(data_dir_path)) { + ret = testutil_mkdir(data_dir_path, 0755); + assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir_path, ret, errno, strerror(errno)); } } diff --git a/backend/tests/test_svg.c b/backend/tests/test_svg.c index 1f456f41..7114741a 100644 --- a/backend/tests/test_svg.c +++ b/backend/tests/test_svg.c @@ -111,9 +111,11 @@ static void test_print(int index, int generate, int debug) { char *text; if (generate) { - if (!testUtilExists(data_dir)) { - ret = testutil_mkdir(data_dir, 0755); - assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir, ret, errno, strerror(errno)); + char data_dir_path[1024]; + assert_nonzero(testUtilDataPath(data_dir_path, sizeof(data_dir_path), data_dir, NULL), "testUtilDataPath(%s) == 0\n", data_dir); + if (!testUtilExists(data_dir_path)) { + ret = testutil_mkdir(data_dir_path, 0755); + assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir_path, ret, errno, strerror(errno)); } } diff --git a/backend/tests/test_tif.c b/backend/tests/test_tif.c index b83d2bc9..75ca0092 100644 --- a/backend/tests/test_tif.c +++ b/backend/tests/test_tif.c @@ -190,9 +190,11 @@ static void test_print(int index, int generate, int debug) { char *text; if (generate) { - if (!testUtilExists(data_dir)) { - ret = testutil_mkdir(data_dir, 0755); - assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir, ret, errno, strerror(errno)); + char data_dir_path[1024]; + assert_nonzero(testUtilDataPath(data_dir_path, sizeof(data_dir_path), data_dir, NULL), "testUtilDataPath(%s) == 0\n", data_dir); + if (!testUtilExists(data_dir_path)) { + ret = testutil_mkdir(data_dir_path, 0755); + assert_zero(ret, "testutil_mkdir(%s) ret %d != 0 (%d: %s)\n", data_dir_path, ret, errno, strerror(errno)); } }