Merge pull request #161 from ngageoint/windowsFix

Handle spaces in Windows pathnames
ngageoint · Feb 23, 2017 · 4c12886 · 4c12886
2 parents 7a9ed95 + 22065a5
commit 4c12886
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/six/modules/c++/six.sidd/tests/test_sidd_blocking.cpp b/six/modules/c++/six.sidd/tests/test_sidd_blocking.cpp
@@ -72,15 +72,25 @@ class TempFileWithExtension
 std::string getProgramPathname(const std::string& installPathname,
         const std::string& programName)
 {
-    const sys::Path testPath = sys::Path(installPathname).join("bin").
-            join(programName);
-    const std::string testPathname = testPath.exists() ? testPath.getPath() :
-            testPath.getPath() + ".exe";
+    std::string testPathname = str::toString(sys::Path(installPathname).
+        join("bin").join(programName));
+
+    if (!sys::OS().exists(testPathname))
+    {
+        testPathname += ".exe";
+    }
 
     if (!sys::OS().exists(testPathname))
     {
         throw except::Exception(Ctxt("Unable to find " + testPathname));
     }
+
+    // Clean it up so path is readable
+    if (str::contains(testPathname, " "))
+    {
+        testPathname = "\"" + testPathname + "\"";
+    }
+
     return testPathname;
 }