mirror of
https://github.com/blender/blender
synced 2026-09-29 04:37:17 +03:00
Merge branch 'blender-v2.91-release' into master
This commit is contained in:
commit
45e8218f90
1 changed files with 13 additions and 8 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue