Make crop_sicd's method of finding the appropriate directories more reliable.

six/modules/c++/samples/crop_sicd.cpp

@@ -88,7 +88,9 @@ int main(int argc, char** argv)
 {
     try
     {
-        const sys::Path::StringPair splitName(sys::Path::splitPath(argv[0]));
+        sys::OS os;
+        const sys::Path::StringPair splitName(sys::Path::splitPath(
+                os.getCurrentExecutable(argv[0])));
         const sys::Path progDirname(splitName.first);
         const sys::Path installPath(progDirname.join("..").getAbsolutePath());
 

six/modules/python/six/tests/checkNITFs.py

@@ -28,7 +28,6 @@
 
 from subprocess import call
 
-print utils.installPath()
 binDir = os.path.join(utils.installPath(), 'bin')
 
 def roundTrippedName(pathname):
@@ -41,7 +40,7 @@ def roundTripSix(pathname):
 def validate(pathname):
     check_valid_six = utils.executableName(os.path.join(binDir,
             'check_valid_six'))
-    
+
     return (call([check_valid_six, pathname], stdout=open(os.devnull, 'w')) and
             call([check_valid_six, roundTrippedName(pathname)],
             stdout=open(os.devnull, 'w'))) == 0

six/modules/python/six/tests/runMiscTests.py

@@ -51,7 +51,9 @@ def runSICDTests():
     # Make sure plugins installed properly
     nitfPluginPath = os.environ['NITF_PLUGIN_PATH_REAL']
 
-    if not any(plugin.startswith('PIAIMB') for plugin in os.listdir(nitfPluginPath)): 
+    if (not os.path.exists(nitfPluginPath) or
+            not any(plugin.startswith('PIAIMB') for plugin in
+                    os.listdir(nitfPluginPath))):
         print('Could not find NITF plugins. Please re-install with '
                 'the following command.')
         print('python waf install --target=PIAIMB')
@@ -70,3 +72,6 @@ def runSICDTests():
 
 def run():
     return runSICDTests()
+
+if __name__ == '__main__':
+    run()

six/modules/python/six/tests/runTests.py

@@ -34,39 +34,73 @@
 import checkNITFs
 import utils
 
-utils.setPaths()
-
-if platform.system() != 'SunOS':
-    if makeRegressionFiles.run() == False:
-        print("Error generating regression files")
-        sys.exit(1)
-
-    if runPythonScripts.run() == False:
-        print("Error running a python script")
-        sys.exit(1)
-
-    if checkNITFs.run() == False:
-        print("test in checkNITFS.py failed")
-        sys.exit(1)
-
-    if runMiscTests.run() == False:
-    # Tests should report their own errors
-        sys.exit(1)
-else:
-    print('Warning: skipping the bulk of the test suite, as Python modules ' +
-          'are by default disabled on Solaris')
-
-print("Performing byte swap test")
-if subprocess.call([utils.executableName(os.path.join(
-        utils.installPath(), 'tests', 'six.sidd', 'test_byte_swap'))]) != 0:
-    print("Failed ByteSwap test in six.sidd/tests/test_byte_swap")
-    sys.exit(1)
-print("Byte swap test succeeded")
 
-if runUnitTests.run() == False:
-    print("Unit tests failed")
-    sys.exit(1)
+def run(sicdDir):
+    # If we don't run this before setting the paths, we won't be testing
+    # the right things
+
+    if sicdDir != '':
+        os.environ["PATH"] = (os.environ["PATH"] + os.pathsep +
+                os.path.join(utils.installPath(), 'bin'))
+        cropSicds = utils.executableName('crop_sicd')
+
+        sicdPathname = os.path.join(sicdDir, os.listdir(sicdDir)[0])
+
+        success = subprocess.call([cropSicds,
+                '--start-row', '0', '--start-col', '0',
+                '--num-rows', '10', '--num-cols', '10',
+                sicdPathname, 'cropped.nitf'],
+                stdout=subprocess.PIPE)
+
+        print("Running crop_sicd")
+        if os.path.exists('cropped.nitf'):
+            os.remove('cropped.nitf')
+        if success != 0:
+            print("Error running crop_sicd")
+            return False
+
+    utils.setPaths()
+
+    if platform.system() != 'SunOS':
+        if makeRegressionFiles.run() == False:
+            print("Error generating regression files")
+            return False
 
-print("All passed")
-sys.exit(0)
+        if runPythonScripts.run() == False:
+            print("Error running a python script")
+            return False
+
+        if checkNITFs.run() == False:
+            print("test in checkNITFS.py failed")
+            return False
+
+        if runMiscTests.run() == False:
+            # These tests should report their own errors
+            return False
+    else:
+        print('Warning: skipping the bulk of the test suite, '
+                'since Python modules are by default disabled on Solaris')
+
+    print("Performing byte swap test")
+    if subprocess.call([
+            utils.executableName(os.path.join(utils.installPath(),
+            'tests', 'six.sidd', 'test_byte_swap'))]) != 0:
+        print("Failed ByteSwap test in six.sidd/tests/test_byte_swap")
+        return False
+    print("Byte swap test succeeded")
+
+    if runUnitTests.run() == False:
+        print("Unit tests failed")
+        return False
+
+    print("All passed")
+    return True
+
+if __name__ == '__main__':
+    sicdDir = ''
+    if len(sys.argv) > 1:
+        sicdDir = sys.argv[1]
+    if run(sicdDir):
+        sys.exit(0)
+    sys.exit(1)
 

six/modules/python/six/tests/utils.py

@@ -43,6 +43,7 @@ def findSixHome():
 
     return currentPath
 
+
 def installPath():
     home = findSixHome()
     children = ['remove_foss.csh', 'README.md', 'six', 'wscript',
@@ -55,6 +56,7 @@ def installPath():
             subdirs = os.listdir(fullChildPath)
             if 'tests' in subdirs and 'bin' in subdirs:
                 return fullChildPath
+
 def findPythonPath():
     if platform.system() == 'Linux':
         return glob(os.path.join(installPath(), 'lib', 'python*',
@@ -100,6 +102,5 @@ def executableName(pathname):
         if pathname.endswith('.exe'):
             return pathname
         return pathname + '.exe'
-    if pathname.startswith('/'):
-        return pathname
-    return './' + pathname
+    return pathname
+