From 71b1760efb3a690dbb9c97d74d1b8b46fb1e1320 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Thu, 19 Nov 2020 18:44:25 +0100 Subject: [PATCH] now all test_output subirectories in flat hierarchy --- Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp index 066e8b29b42..c88a07c85a8 100644 --- a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp +++ b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp @@ -53,17 +53,16 @@ TEST_F(CoreIOPathTest, CoreIOPath) "\xd0\xb4\xd0\xb8\xd1\x80\xd0\xb5\xd0\xba\xd1\x82\xd0\xbe\xd1\x80\xd0\xb8\xd1\x8f"; const boost::filesystem::path test_dir(BATesting::TestOutDir_Core()); - const boost::filesystem::path test_subdir("test_CoreIOPathTest"); - FileSystemUtils::createDirectories((test_dir / test_subdir).string()); + FileSystemUtils::createDirectories(test_dir.string()); // tests file writing when file name contains cyrillic characters boost::filesystem::path test_file(filename_rus); - EXPECT_TRUE(test_io(data.get(), (test_dir / test_subdir / test_file).string())); + EXPECT_TRUE(test_io(data.get(), (test_dir / test_file).string())); // tests file writing and directory creation when dirname contains cyrillic characters boost::filesystem::path test_subdir_rus(dirname_rus); - FileSystemUtils::createDirectories((test_dir / test_subdir / test_subdir_rus).string()); + FileSystemUtils::createDirectories((test_dir / test_subdir_rus).string()); EXPECT_TRUE( - test_io(data.get(), (test_dir / test_subdir / test_subdir_rus / test_file).string())); + test_io(data.get(), (test_dir / test_subdir_rus / test_file).string())); } -- GitLab