Commit 941f912c authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'pathes-typo-fix'

94484960 Source typo fix s/[Pp]athes/[Pp]aths/
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !93
parents 7a8ea60b 94484960
...@@ -738,29 +738,29 @@ static bool CheckGetPath() ...@@ -738,29 +738,29 @@ static bool CheckGetPath()
#endif #endif
const char* registryPath = "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MyApp; MyKey]"; const char* registryPath = "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MyApp; MyKey]";
std::vector<std::string> originalPathes; std::vector<std::string> originalPaths;
originalPathes.push_back(registryPath); originalPaths.push_back(registryPath);
std::vector<std::string> expectedPathes; std::vector<std::string> expectedPaths;
expectedPathes.push_back(registryPath); expectedPaths.push_back(registryPath);
#ifdef _WIN32 #ifdef _WIN32
expectedPathes.push_back("C:/Somewhere/something"); expectedPaths.push_back("C:/Somewhere/something");
expectedPathes.push_back("D:/Temp"); expectedPaths.push_back("D:/Temp");
#else #else
expectedPathes.push_back("/Somewhere/something"); expectedPaths.push_back("/Somewhere/something");
expectedPathes.push_back("/tmp"); expectedPaths.push_back("/tmp");
#endif #endif
bool res = true; bool res = true;
res &= CheckPutEnv(std::string(envName) + "=" + envValue, envName, envValue); res &= CheckPutEnv(std::string(envName) + "=" + envValue, envName, envValue);
std::vector<std::string> pathes = originalPathes; std::vector<std::string> paths = originalPaths;
kwsys::SystemTools::GetPath(pathes, envName); kwsys::SystemTools::GetPath(paths, envName);
if (pathes != expectedPathes) { if (paths != expectedPaths) {
std::cerr << "GetPath(" << StringVectorToString(originalPathes) << ", " std::cerr << "GetPath(" << StringVectorToString(originalPaths) << ", "
<< envName << ") yielded " << StringVectorToString(pathes) << envName << ") yielded " << StringVectorToString(paths)
<< " instead of " << StringVectorToString(expectedPathes) << " instead of " << StringVectorToString(expectedPaths)
<< std::endl; << std::endl;
res = false; res = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment