diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-10-08 12:32:22 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-10-08 12:32:22 +0300 |
| commit | a3e2cc0bb7fe47fa1122cd19c4fa8a5aa59f761c (patch) | |
| tree | 39ef2ecb526381af67d66043576de9f0b9f33940 /source/blender/blenkernel/intern/asset_catalog_test.cc | |
| parent | bd65d3ce97e075fe12aec9f31721c68377d31a9e (diff) | |
Asset Catalogs: Fix unit test on Windows
Force native slashes before comparing paths; on Windows mixing
separators caused a unit test to fail.
No functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/asset_catalog_test.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/asset_catalog_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/asset_catalog_test.cc b/source/blender/blenkernel/intern/asset_catalog_test.cc index fe7222920ab..dc39cefed5a 100644 --- a/source/blender/blenkernel/intern/asset_catalog_test.cc +++ b/source/blender/blenkernel/intern/asset_catalog_test.cc @@ -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. */ |