summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-02-07 12:28:57 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-02-07 12:28:57 -0500
commit32e11494ffde368b2ac166e16dc294d66a18492f (patch)
tree9e53a9ca7d8e504c66cb711349b5cd225d956966 /indra/llcommon
parent5d2bb536324a906078b224bdc9697b368e96a6b6 (diff)
Use os.path.normcase(os.path.normpath()) when comparing directories.
Once again we've been bitten by comparison failure between "c:\somepath" and "C:\somepath". Normalize paths in both Python helper scripts to make that comparison more robust.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/tests/llprocess_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 60ed12ad6a..6d2292fb88 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -186,7 +186,7 @@ public:
"from __future__ import with_statement\n"
"import os.path, sys, tempfile\n"
"with open(sys.argv[1], 'w') as f:\n"
- " f.write(os.path.realpath(tempfile.mkdtemp()))\n"))
+ " f.write(os.path.normcase(os.path.normpath(os.path.realpath(tempfile.mkdtemp()))))\n"))
{}
~NamedTempDir()
@@ -513,7 +513,7 @@ namespace tut
"from __future__ import with_statement\n"
"import os, sys\n"
"with open(sys.argv[1], 'w') as f:\n"
- " f.write(os.getcwd())\n");
+ " f.write(os.path.normcase(os.path.normpath(os.getcwd())))\n");
// Before running, call setWorkingDirectory()
py.mParams.cwd = tempdir.getName();
ensure_equals("os.getcwd()", py.run_read(), tempdir.getName());