From e666b8e825a59d2adf95eaabfa6685fe28c21067 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 9 Feb 2006 18:39:00 -0500 Subject: BUG: Avoid case problems on windows. --- Tests/Complex/Executable/complex.cxx | 9 +++++++++ Tests/ComplexOneConfig/Executable/complex.cxx | 9 +++++++++ Tests/ComplexRelativePaths/Executable/complex.cxx | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index f7f8d53..67459d6 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -54,6 +54,15 @@ bool TestLibraryOrder(bool shouldFail) std::string Adir = std::string(BINARY_DIR) + std::string("/A"); std::string Bdir = std::string(BINARY_DIR) + std::string("/B"); std::string Cdir = std::string(BINARY_DIR) + std::string("/C"); +#ifdef _WIN32 + // Avoid case problems for windows paths. + if(Adir[0] >= 'A' && Adir[0] <= 'Z') { Adir[0] += 'a' - 'A'; } + if(Bdir[0] >= 'A' && Bdir[0] <= 'Z') { Bdir[0] += 'a' - 'A'; } + if(Cdir[0] >= 'A' && Cdir[0] <= 'Z') { Cdir[0] += 'a' - 'A'; } + Adir = cmSystemTools::GetActualCaseForPath(Adir.c_str()); + Bdir = cmSystemTools::GetActualCaseForPath(Bdir.c_str()); + Cdir = cmSystemTools::GetActualCaseForPath(Cdir.c_str()); +#endif if(!shouldFail) { diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index f7f8d53..67459d6 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -54,6 +54,15 @@ bool TestLibraryOrder(bool shouldFail) std::string Adir = std::string(BINARY_DIR) + std::string("/A"); std::string Bdir = std::string(BINARY_DIR) + std::string("/B"); std::string Cdir = std::string(BINARY_DIR) + std::string("/C"); +#ifdef _WIN32 + // Avoid case problems for windows paths. + if(Adir[0] >= 'A' && Adir[0] <= 'Z') { Adir[0] += 'a' - 'A'; } + if(Bdir[0] >= 'A' && Bdir[0] <= 'Z') { Bdir[0] += 'a' - 'A'; } + if(Cdir[0] >= 'A' && Cdir[0] <= 'Z') { Cdir[0] += 'a' - 'A'; } + Adir = cmSystemTools::GetActualCaseForPath(Adir.c_str()); + Bdir = cmSystemTools::GetActualCaseForPath(Bdir.c_str()); + Cdir = cmSystemTools::GetActualCaseForPath(Cdir.c_str()); +#endif if(!shouldFail) { diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index f7f8d53..67459d6 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -54,6 +54,15 @@ bool TestLibraryOrder(bool shouldFail) std::string Adir = std::string(BINARY_DIR) + std::string("/A"); std::string Bdir = std::string(BINARY_DIR) + std::string("/B"); std::string Cdir = std::string(BINARY_DIR) + std::string("/C"); +#ifdef _WIN32 + // Avoid case problems for windows paths. + if(Adir[0] >= 'A' && Adir[0] <= 'Z') { Adir[0] += 'a' - 'A'; } + if(Bdir[0] >= 'A' && Bdir[0] <= 'Z') { Bdir[0] += 'a' - 'A'; } + if(Cdir[0] >= 'A' && Cdir[0] <= 'Z') { Cdir[0] += 'a' - 'A'; } + Adir = cmSystemTools::GetActualCaseForPath(Adir.c_str()); + Bdir = cmSystemTools::GetActualCaseForPath(Bdir.c_str()); + Cdir = cmSystemTools::GetActualCaseForPath(Cdir.c_str()); +#endif if(!shouldFail) { -- cgit v0.12