archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Asset Catalogs: Fix unit test on Windows

Browse Source 
Force native slashes before comparing paths; on Windows mixing
separators caused a unit test to fail.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2021-10-08 11:32:22 +02:00
parent bd65d3ce97
commit a3e2cc0bb7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/asset_catalog_test.cc
View File

@@ -565,8 +565,8 @@ TEST_F(AssetCatalogTest, on_blendfile_save__from_memory_into_existing_cdf_and_me
{
const CatalogFilePath target_dir = create_temp_path(); /* Has trailing slash. */
const CatalogFilePath original_cdf_file = asset_library_root_ + "/blender_assets.cats.txt";
const CatalogFilePath writable_cdf_file = target_dir +
AssetCatalogService::DEFAULT_CATALOG_FILENAME;
CatalogFilePath writable_cdf_file = target_dir + AssetCatalogService::DEFAULT_CATALOG_FILENAME;
BLI_path_slash_native(writable_cdf_file.data());
ASSERT_EQ(0, BLI_copy(original_cdf_file.c_str(), writable_cdf_file.c_str()));
/* Create the catalog service without loading the already-existing CDF. */