griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use native path separator

Browse Source
This commit is contained in:
Campbell Barton
2023-05-13 17:34:51 +10:00
parent a534e05476
commit 4e85d17000
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/tests/blendfile_load_test.cc
View File

@@ -2,13 +2,15 @@
* Copyright 2019 Blender Foundation. */
#include "blendfile_loading_base_test.h"
#include "BLI_path_util.h"
class BlendfileLoadingTest : public BlendfileLoadingBaseTest {
};
TEST_F(BlendfileLoadingTest, CanaryTest)
{
/* Load the smallest blend file we have in the SVN lib/tests directory. */
if (!blendfile_load("modifier_stack/array_test.blend")) {
if (!blendfile_load("modifier_stack" SEP_STR "array_test.blend")) {
return;
}
depsgraph_create(DAG_EVAL_RENDER);

7
source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
View File

@@ -6,6 +6,7 @@
#include "BKE_scene.h"
#include "BLI_math.h"
#include "BLI_path_util.h"
#include "BLO_readfile.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
@@ -122,7 +123,7 @@ class AbstractHierarchyIteratorTest : public BlendfileLoadingBaseTest {
TEST_F(AbstractHierarchyIteratorTest, ExportHierarchyTest)
{
/* Load the test blend file. */
if (!blendfile_load("usd/usd_hierarchy_export_test.blend")) {
if (!blendfile_load("usd" SEP_STR "usd_hierarchy_export_test.blend")) {
return;
}
depsgraph_create(DAG_EVAL_RENDER);
@@ -200,7 +201,7 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest)
* so not included here. Update this test when hair & particle systems are included. */
/* Load the test blend file. */
if (!blendfile_load("usd/usd_hierarchy_export_test.blend")) {
if (!blendfile_load("usd" SEP_STR "usd_hierarchy_export_test.blend")) {
return;
}
depsgraph_create(DAG_EVAL_RENDER);
@@ -320,7 +321,7 @@ class AbstractHierarchyIteratorInvisibleTest : public AbstractHierarchyIteratorT
TEST_F(AbstractHierarchyIteratorInvisibleTest, ExportInvisibleTest)
{
if (!blendfile_load("alembic/visibility.blend")) {
if (!blendfile_load("alembic" SEP_STR "visibility.blend")) {
return;
}
depsgraph_create(DAG_EVAL_RENDER);

3
source/blender/io/ply/tests/io_ply_importer_test.cc
View File

@@ -24,7 +24,8 @@ class ply_import_test : public testing::Test {
public:
void import_and_check(const char *path, const Expectation &exp)
{
std::string ply_path = blender::tests::flags_test_asset_dir() + "/io_tests/ply/" + path;
std::string ply_path = blender::tests::flags_test_asset_dir() +
SEP_STR "io_tests" SEP_STR "ply" SEP_STR + path;
/* Use a small read buffer size for better coverage of buffer refilling behavior. */
PlyReadBuffer infile(ply_path.c_str(), 128);

5
source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
View File

@@ -67,12 +67,13 @@ class obj_importer_test : public BlendfileLoadingBaseTest {
int expect_mat_count,
int expect_image_count = 0)
{
if (!blendfile_load("io_tests/blend_geometry/all_quads.blend")) {
if (!blendfile_load("io_tests" SEP_STR "blend_geometry" SEP_STR "all_quads.blend")) {
ADD_FAILURE();
return;
}
std::string obj_path = blender::tests::flags_test_asset_dir() + "/io_tests/obj/" + path;
std::string obj_path = blender::tests::flags_test_asset_dir() +
SEP_STR "io_tests" SEP_STR "obj" SEP_STR + path;
strncpy(params.filepath, obj_path.c_str(), FILE_MAX - 1);
const size_t read_buffer_size = 650;
importer_main(bfile->main, bfile->curscene, bfile->cur_view_layer, params, read_buffer_size);

2
source/blender/sequencer/intern/proxy.c
View File

@@ -179,7 +179,7 @@ static bool seq_proxy_get_fname(Scene *scene,
BLI_snprintf(filepath,
PROXY_MAXFILE,
"%s/images/%d/%s_proxy%s.jpg",
"%s" SEP_STR "images" SEP_STR "%d" SEP_STR "%s_proxy%s.jpg",
dirpath,
proxy_size_number,
SEQ_render_give_stripelem(scene, seq, timeline_frame)->filename,