diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-19 14:25:42 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-19 14:25:42 -0700 |
| commit | ce0e448962d40af345d80f49fecbcdbcae186926 (patch) | |
| tree | 8b2c893d2a9e6a04b5b6f9292822149b8927a28d /indra | |
| parent | 9fc74de1a18bbb209ee2524b0c833b3016ffc5e3 (diff) | |
Fix to llcontrol_test.cpp, added windows compatible tmp file location.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llxml/tests/llcontrol_test.cpp | 14 |
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); |