summaryrefslogtreecommitdiff
path: root/indra/llxml/tests/llcontrol_test.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-10-19 22:31:47 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-10-19 22:31:47 +0000
commitf9385314ac0942a7bbe23f1813d4017c9dd13d94 (patch)
treef95813106bf74d948074d08ba71b6bbf55c51c3c /indra/llxml/tests/llcontrol_test.cpp
parent7f354e581978d9baf1aaa690af247954f6b1f36b (diff)
Backporting from hg branch @ 3495: Fix to integration test.
Diffstat (limited to 'indra/llxml/tests/llcontrol_test.cpp')
-rw-r--r--indra/llxml/tests/llcontrol_test.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp
index cf1f24ac5f..1ab564264d 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);