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
committerJeroen Bakker <jeroen@blender.org>2020-11-10 16:48:55 +0300
commit670ee877d9ae90e775486edea30beaa968cf125b (patch)
tree264918764e7663ad5842f63f9d5ed83c7c6be2a4
parentffb220590ea76bc279eeb3498776a360467125c1 (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--tests/gtests/blenlib/BLI_path_util_test.cc21
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/gtests/blenlib/BLI_path_util_test.cc b/tests/gtests/blenlib/BLI_path_util_test.cc
index edc2b1189fe..32f2ce18780 100644
--- a/tests/gtests/blenlib/BLI_path_util_test.cc
+++ b/tests/gtests/blenlib/BLI_path_util_test.cc
@@ -635,15 +635,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)
{
@@ -683,3 +684,7 @@ TEST(path_util, PathRelPath)
PATH_REL(abs_path_in, ref_path_in, abs_path_out);
}
}
+
+# undef PATH_REL
+
+#endif