Merge pull request #306 from ngageoint/path_checking

Fix Jenkins build
ngageoint · Jan 23, 2020 · 65cd8a2 · 65cd8a2
2 parents 9be5e27 + 75ca138
commit 65cd8a2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/six/modules/c++/six.sicd/unittests/test_projection_polynomial_fitter.cpp b/six/modules/c++/six.sicd/unittests/test_projection_polynomial_fitter.cpp
@@ -15,7 +15,8 @@ std::string findSixHome(const sys::Path& exePath)
     sys::Path sixHome = exePath.join("..");
     do
     {
-        if (sixHome.join("croppedNitfs").isDirectory())
+        const sys::Path croppedNitfs = sixHome.join("croppedNitfs");
+        if (sys::OS().isDirectory(croppedNitfs.getAbsolutePath()))
         {
             return sixHome;
         }
@@ -146,7 +147,15 @@ int main(int argc, char** argv)
         return 1;
     }
     // Making this global so we don't have to re-read the file every test
-    globalFitter = loadPolynomialFitter(std::string(argv[0]));
+    try
+    {
+        globalFitter = loadPolynomialFitter(std::string(argv[0]));
+    }
+    catch (const except::Exception& ex)
+    {
+        std::cerr << ex.toString() << "\n";
+        return 1;
+    }
     TEST_CHECK(testProjectOutputToSlant);
     TEST_CHECK(testProjectSlantToOutput);
     return 0;

diff --git a/six/modules/python/six/tests/runUnitTests.py b/six/modules/python/six/tests/runUnitTests.py
@@ -24,26 +24,29 @@
 
 import os
 from subprocess import call
+import sys
 
 import utils
 
 def run():
     install = utils.installPath()
     unitTestDir = os.path.join(install, 'unittests')
     childDirs = os.listdir(unitTestDir)
-    success = True
     for childDir in childDirs:
         for test in os.listdir(os.path.join(unitTestDir, childDir)):
             print(os.path.join(unitTestDir, childDir, test))
             testPathname = os.path.join(unitTestDir, childDir, test)
-            command = [utils.executableName(testPathname)]
             if test.endswith('.py'):
-                command = ['python'] + command
+                command = ['python', testPathname]
+            else:
+                command = [utils.executableName(testPathname)]
             if call(command) != 0:
-                success = False
+                print('{} failed'.format(testPathname))
+                return False
 
-    return success
+    return True
 
 if __name__ == '__main__':
+    utils.setPaths()
     run()