diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-10-26 20:35:34 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-10-26 20:35:34 +0300 |
| commit | 45e8218f9038b1b7c765a3349d6f3decfadca6ef (patch) | |
| tree | 1712af44a13136a77e5e57ba217775d40bc85977 | |
| parent | 183c2fe0314bfc6abb162507583784b565382e6e (diff) | |
| parent | edf4378c442a24c8f35959a52a1d3e9894e0b6a0 (diff) | |
Merge branch 'blender-v2.91-release' into master
| -rw-r--r-- | source/blender/blenlib/tests/BLI_path_util_test.cc | 21 |
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 |