Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-10-26 20:29:54 +0300
committerBastien Montagne <bastien@blender.org>2020-10-26 20:29:54 +0300
commitedf4378c442a24c8f35959a52a1d3e9894e0b6a0 (patch)
treef33c90b18551867115507b371e75ad571a1e5889
parent01d3fbc496a2d2ce09910754b47306fb719cb940 (diff)
Fix own previous commit re testing of `BLI_rel_path`.
Windows would need its own version of those tests, for now just disabling them on that platform.
-rw-r--r--source/blender/blenlib/tests/BLI_path_util_test.cc21
1 files changed, 13 insertions, 8 deletions
diff --git a/source/blender/blenlib/tests/BLI_path_util_test.cc b/source/blender/blenlib/tests/BLI_path_util_test.cc
index 5ec057a8501..927d24d2c4c 100644
--- a/source/blender/blenlib/tests/BLI_path_util_test.cc
+++ b/source/blender/blenlib/tests/BLI_path_util_test.cc
@@ -602,15 +602,16 @@ TEST(path_util, PathExtension)
}
/* BLI_path_rel. */
+#ifndef _WIN32
-#define PATH_REL(abs_path, ref_path, rel_path) \
- { \
- char path[FILE_MAX]; \
- BLI_strncpy(path, abs_path, sizeof(path)); \
- BLI_path_rel(path, ref_path); \
- EXPECT_STREQ(rel_path, path); \
- } \
- void(0)
+# define PATH_REL(abs_path, ref_path, rel_path) \
+ { \
+ char path[FILE_MAX]; \
+ BLI_strncpy(path, abs_path, sizeof(path)); \
+ BLI_path_rel(path, ref_path); \
+ EXPECT_STREQ(rel_path, path); \
+ } \
+ void(0)
TEST(path_util, PathRelPath)
{
@@ -650,3 +651,7 @@ TEST(path_util, PathRelPath)
PATH_REL(abs_path_in, ref_path_in, abs_path_out);
}
}
+
+# undef PATH_REL
+
+#endif