Commit 8f5b6962 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'update-kwsys'

4c90e943 Merge branch 'upstream-KWSys' into update-kwsys
b66f18c8

 KWSys 2018-03-29 (488f2031)
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1902
parents 1b6ec4b9 4c90e943
......@@ -3344,15 +3344,20 @@ std::string SystemTools::RelativePath(const std::string& local,
static std::string GetCasePathName(std::string const& pathIn)
{
std::string casePath;
std::vector<std::string> path_components;
SystemTools::SplitPath(pathIn, path_components);
if (path_components[0].empty()) // First component always exists.
{
// Relative paths cannot be converted.
// First check if the file is relative. We don't fix relative paths since the
// real case depends on the root directory and the given path fragment may
// have meaning elsewhere in the project.
if (!SystemTools::FileIsFullPath(pathIn)) {
// This looks unnecessary, but it allows for the return value optimization
// since all return paths return the same local variable.
casePath = pathIn;
return casePath;
}
std::vector<std::string> path_components;
SystemTools::SplitPath(pathIn, path_components);
// Start with root component.
std::vector<std::string>::size_type idx = 0;
casePath = path_components[idx++];
......
......@@ -153,6 +153,7 @@ static const char* kwsysTerminalVT100Names[] = { "Eterm",
"xterm-88color",
"xterm-color",
"xterm-debian",
"xterm-kitty",
"xterm-termite",
0 };
......
......@@ -738,29 +738,29 @@ static bool CheckGetPath()
#endif
const char* registryPath = "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MyApp; MyKey]";
std::vector<std::string> originalPathes;
originalPathes.push_back(registryPath);
std::vector<std::string> originalPaths;
originalPaths.push_back(registryPath);
std::vector<std::string> expectedPathes;
expectedPathes.push_back(registryPath);
std::vector<std::string> expectedPaths;
expectedPaths.push_back(registryPath);
#ifdef _WIN32
expectedPathes.push_back("C:/Somewhere/something");
expectedPathes.push_back("D:/Temp");
expectedPaths.push_back("C:/Somewhere/something");
expectedPaths.push_back("D:/Temp");
#else
expectedPathes.push_back("/Somewhere/something");
expectedPathes.push_back("/tmp");
expectedPaths.push_back("/Somewhere/something");
expectedPaths.push_back("/tmp");
#endif
bool res = true;
res &= CheckPutEnv(std::string(envName) + "=" + envValue, envName, envValue);
std::vector<std::string> pathes = originalPathes;
kwsys::SystemTools::GetPath(pathes, envName);
std::vector<std::string> paths = originalPaths;
kwsys::SystemTools::GetPath(paths, envName);
if (pathes != expectedPathes) {
std::cerr << "GetPath(" << StringVectorToString(originalPathes) << ", "
<< envName << ") yielded " << StringVectorToString(pathes)
<< " instead of " << StringVectorToString(expectedPathes)
if (paths != expectedPaths) {
std::cerr << "GetPath(" << StringVectorToString(originalPaths) << ", "
<< envName << ") yielded " << StringVectorToString(paths)
<< " instead of " << StringVectorToString(expectedPaths)
<< std::endl;
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