summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-08-17 11:42:09 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-08-17 11:42:09 -0400
commit36ed0e98ea7bd591a798a4373e8aa78a8fca4d14 (patch)
treee1392abf3b95a28cb83f185cd1a18df4c44d9221 /indra/llcommon
parent931a2fd63de2de417adbe3e02d55af7a459bca36 (diff)
DRTVWR-588: Try harder to normalize Windows pathames to compare.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/tests/llprocess_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index c48d913069..56dc2e4fa9 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -260,6 +260,7 @@ public:
}
std::string getName() const { return mPath.string(); }
+ std::string getNormalName() const { return mPath.lexically_normal().string(); }
private:
boost::filesystem::path mPath;
@@ -591,7 +592,7 @@ namespace tut
" f.write(os.path.normcase(os.path.normpath(os.getcwd())))\n");
// Before running, call setWorkingDirectory()
py.mParams.cwd = tempdir.getName();
- std::string expected{ tempdir.getName() };
+ std::string expected{ tempdir.getNormalName() };
#if LL_WINDOWS
// SIGH, don't get tripped up by "C:" != "c:" --
// but on the Mac, using tolower() fails because "/users" != "/Users"!