mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-10 07:13:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'std-filesystem-hotfix' into 'master'

Browse Source 
Use std::filesystem for unit tests temporary files path.

See merge request OpenMW/openmw!2402
This commit is contained in:
psi29a 2022-09-19 20:47:33 +00:00
commit 9a9c7fa7cf
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw_test_suite/CMakeLists.txt
View File

@ -109,8 +109,8 @@ file(DOWNLOAD
) )
target_compile_definitions(openmw_test_suite target_compile_definitions(openmw_test_suite
PRIVATE OPENMW_DATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/data" PRIVATE OPENMW_DATA_DIR=u8"${CMAKE_CURRENT_BINARY_DIR}/data"
OPENMW_TEST_SUITE_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") OPENMW_TEST_SUITE_SOURCE_DIR=u8"${CMAKE_CURRENT_SOURCE_DIR}")
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC) if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
target_precompile_headers(openmw_test_suite PRIVATE target_precompile_headers(openmw_test_suite PRIVATE

2
apps/openmw_test_suite/esm3/readerscache.cpp
View File

@ -39,7 +39,7 @@ namespace
{ {
static constexpr std::size_t sInitialOffset = 324; static constexpr std::size_t sInitialOffset = 324;
static constexpr std::size_t sSkip = 100; static constexpr std::size_t sSkip = 100;
const Files::PathContainer mDataDirs {{std::string(OPENMW_DATA_DIR)}}; const Files::PathContainer mDataDirs {{std::filesystem::path{OPENMW_DATA_DIR}}};
const Files::Collections mFileCollections {mDataDirs, true}; const Files::Collections mFileCollections {mDataDirs, true};
const std::string mContentFile = "template.omwgame"; const std::string mContentFile = "template.omwgame";
const std::filesystem::path mContentFilePath = mFileCollections.getCollection(".omwgame").getPath(mContentFile); const std::filesystem::path mContentFilePath = mFileCollections.getCollection(".omwgame").getPath(mContentFile);

2
apps/openmw_test_suite/esmloader/load.cpp
View File

@ -25,7 +25,7 @@ namespace
struct EsmLoaderTest : Test struct EsmLoaderTest : Test
{ {
const Files::PathContainer mDataDirs {{std::string(OPENMW_DATA_DIR)}}; const Files::PathContainer mDataDirs {{std::filesystem::path{OPENMW_DATA_DIR}}};
const Files::Collections mFileCollections {mDataDirs, true}; const Files::Collections mFileCollections {mDataDirs, true};
const std::vector<std::string> mContentFiles {{"template.omwgame"}}; const std::vector<std::string> mContentFiles {{"template.omwgame"}};
}; };

4
apps/openmw_test_suite/toutf8/toutf8.cpp
View File

@ -1,8 +1,10 @@
#include <components/to_utf8/to_utf8.hpp> #include <components/to_utf8/to_utf8.hpp>
#include <components/misc/strings/conversion.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <fstream> #include <fstream>
#include <filesystem>
#ifndef OPENMW_TEST_SUITE_SOURCE_DIR #ifndef OPENMW_TEST_SUITE_SOURCE_DIR
#define OPENMW_TEST_SUITE_SOURCE_DIR "" #define OPENMW_TEST_SUITE_SOURCE_DIR ""
@ -24,7 +26,7 @@ namespace
{ {
std::ifstream file; std::ifstream file;
file.exceptions(std::ios::failbit | std::ios::badbit); file.exceptions(std::ios::failbit | std::ios::badbit);
file.open(std::string(OPENMW_TEST_SUITE_SOURCE_DIR) + "/toutf8/data/" + fileName); file.open(std::filesystem::path{ OPENMW_TEST_SUITE_SOURCE_DIR } / "toutf8" / "data" / Misc::StringUtils::stringToU8String(fileName));
std::stringstream buffer; std::stringstream buffer;
buffer << file.rdbuf(); buffer << file.rdbuf();
return buffer.str(); return buffer.str();