From 32e11494ffde368b2ac166e16dc294d66a18492f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 7 Feb 2012 12:28:57 -0500
Subject: [PATCH] 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.
---
indra/llcommon/tests/llprocess_test.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index 60ed12ad6a9..6d2292fb88e 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -186,7 +186,7 @@ class NamedTempDir: public boost::noncopyable
"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());
--
GitLab