birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/Tests/Utils/Utils.cpp
+4 -4
View File
@@ -25,8 +25,8 @@ UnitTest::ScopedTemporaryDirectory::ScopedTemporaryDirectory()
for (int i = 0; i < MaxAttempts; ++i)
{
auto randomFolder = AZ::Uuid::CreateRandom().ToString<AZStd::string>(false, false);
AZStd::string testPath;
auto randomFolder = AZ::Uuid::CreateRandom().ToString<AZStd::fixed_string<512>>(false, false);
AZ::IO::FixedMaxPath testPath;
#if !AZ_TRAIT_USE_POSIX_TEMP_FOLDER
auto path = userTempFolder / ("UnitTest-" + randomFolder).c_str();
testPath = path.string().c_str();
@@ -42,7 +42,7 @@ UnitTest::ScopedTemporaryDirectory::ScopedTemporaryDirectory()
#else
m_tempDirectory = testPath;
#endif
m_directoryExists = AZ::IO::LocalFileIO::GetInstance()->CreatePath(m_tempDirectory.c_str());
m_directoryExists = AZ::IO::SystemFile::CreateDir(m_tempDirectory.c_str());
break;
}
}
@@ -54,7 +54,7 @@ UnitTest::ScopedTemporaryDirectory::~ScopedTemporaryDirectory()
{
if (m_directoryExists)
{
AZ::IO::LocalFileIO::GetInstance()->DestroyPath(m_tempDirectory.c_str());
AZ::IO::SystemFile::DeleteDir(m_tempDirectory.c_str());
}
}