diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index ad41b7518..428ce6202 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -471,7 +471,12 @@ int main() cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " "CACHE_TEST_VAR_INTERNAL is not defined."); #else - if(strcmp(CACHE_TEST_VAR_INTERNAL, "bar") != 0) + std::string cachetest = CACHE_TEST_VAR_INTERNAL; + std::string copy = cachetest; + cachetest.find("bar"); + cachetest.rfind("bar"); + copy = cachetest.substr(0, cachetest.size()); + if(cachetest != "bar") { cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " "CACHE_TEST_VAR_INTERNAL == ", CACHE_TEST_VAR_INTERNAL); diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index ad41b7518..428ce6202 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -471,7 +471,12 @@ int main() cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " "CACHE_TEST_VAR_INTERNAL is not defined."); #else - if(strcmp(CACHE_TEST_VAR_INTERNAL, "bar") != 0) + std::string cachetest = CACHE_TEST_VAR_INTERNAL; + std::string copy = cachetest; + cachetest.find("bar"); + cachetest.rfind("bar"); + copy = cachetest.substr(0, cachetest.size()); + if(cachetest != "bar") { cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " "CACHE_TEST_VAR_INTERNAL == ", CACHE_TEST_VAR_INTERNAL); diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index ad41b7518..428ce6202 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -471,7 +471,12 @@ int main() cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " "CACHE_TEST_VAR_INTERNAL is not defined."); #else - if(strcmp(CACHE_TEST_VAR_INTERNAL, "bar") != 0) + std::string cachetest = CACHE_TEST_VAR_INTERNAL; + std::string copy = cachetest; + cachetest.find("bar"); + cachetest.rfind("bar"); + copy = cachetest.substr(0, cachetest.size()); + if(cachetest != "bar") { cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " "CACHE_TEST_VAR_INTERNAL == ", CACHE_TEST_VAR_INTERNAL);