From ce0e448962d40af345d80f49fecbcdbcae186926 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Mon, 19 Oct 2009 14:25:42 -0700
Subject: [PATCH] Fix to llcontrol_test.cpp, added windows compatible tmp file
location.
---
indra/llxml/tests/llcontrol_test.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp
index cf1f24ac5ff..1ab564264df 100644
--- a/indra/llxml/tests/llcontrol_test.cpp
+++ b/indra/llxml/tests/llcontrol_test.cpp
@@ -54,7 +54,21 @@ namespace tut
random.generate();
// generate temp dir
std::ostringstream oStr;
+
+#ifdef LL_WINDOWS
+ char* tmp_dir = getenv("TMP");
+ if(tmp_dir)
+ {
+ oStr << tmp_dir << "/llcontrol-test-" << random << "/";
+ }
+ else
+ {
+ oStr << "c:/tmp/llcontrol-test-" << random << "/";
+ }
+#else
oStr << "/tmp/llcontrol-test-" << random << "/";
+#endif
+
mTestConfigDir = oStr.str();
mTestConfigFile = mTestConfigDir + "settings.xml";
LLFile::mkdir(mTestConfigDir);
--
GitLab