Skip to content
Snippets Groups Projects
Commit f37d2c30 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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

Remove llcommon circular dependency on llfilesystem, which doesn't work for
this case anyway.
parent 908fb3fe
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
......@@ -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}")
......
......@@ -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
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment