livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-18837: Don't use LLDir, use NamedTempFile::temp_path. 

Remove llcommon circular dependency on llfilesystem, which doesn't work for
this case anyway.
master
Nat Goodspeed 2023-07-08 09:04:33 -04:00
parent 908fb3fed6
commit f37d2c3076
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/CMakeLists.txt
View File

@ -308,7 +308,7 @@ if (LL_TESTS)
LL_ADD_INTEGRATION_TEST(llleap "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llmainthreadtask "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llpounceable "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llprocess "" "${test_libs};llfilesystem")
LL_ADD_INTEGRATION_TEST(llprocess "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llprocessor "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llprocinfo "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llrand "" "${test_libs}")

5
indra/llcommon/tests/llprocess_test.cpp
View File

@ -30,7 +30,6 @@
#include "../test/namedtempfile.h"
#include "../test/catch_and_store_what_in.h"
#include "stringize.h"
#include "../llfilesystem/lldir.h"
#include "llsdutil.h"
#include "llevents.h"
#include "llstring.h"
@ -152,11 +151,9 @@ struct PythonProcessLauncher
/// Launch Python script; verify that it launched
void launch()
{
std::string logpath{ gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "apr.log") };
std::string logpath{ NamedTempFile::temp_path("apr", ".log").string() };
#if LL_WINDOWS
_putenv_s("APR_LOG", logpath.c_str());
#else
setenv("APR_LOG", logpath.c_str(), 1);
#endif
try
{