Post merge commit for safety. Building Fortran code works, but tests fail.

1 files changed, 19 insertions, 14 deletions

diff --git a/runtest.py b/runtest.py
index 1b5c7ddd..0950bbe7 100755
--- a/runtest.py
+++ b/runtest.py
@@ -77,6 +77,8 @@
 # library directory.  If we ever resurrect that as the default, then
 # you can find the appropriate code in the 0.04 version of this script,
 # rather than reinventing that wheel.)
+from __future__ import print_function
+
 
 import getopt
 import glob
@@ -88,10 +90,13 @@ import time
 
 try:
     import threading
-    import Queue                # 2to3: rename to queue
+    try:                        # python3
+        from queue import Queue
+    except ImportError as e:    # python2
+        from Queue import Queue
     threading_ok = True
 except ImportError:
-    print "Can't import threading or queue"
+    print("Can't import threading or queue")
     threading_ok = False
 
 cwd = os.getcwd()
@@ -183,12 +188,12 @@ class PassThroughOptionParser(OptionParser):
     def _process_long_opt(self, rargs, values):
         try:
             OptionParser._process_long_opt(self, rargs, values)
-        except BadOptionError, err:
+        except BadOptionError as err:
             self.largs.append(err.opt_str)
     def _process_short_opts(self, rargs, values):
         try:
             OptionParser._process_short_opts(self, rargs, values)
-        except BadOptionError, err:
+        except BadOptionError as err:
             self.largs.append(err.opt_str)
 
 parser = PassThroughOptionParser(add_help_option=False)
@@ -238,7 +243,7 @@ for o, a in opts:
             a = os.path.join(cwd, a)
         testlistfile = a
     elif o in ['-h', '--help']:
-        print helpstr
+        print(helpstr)
         sys.exit(0)
     elif o in ['-j', '--jobs']:
         jobs = int(a)
@@ -328,7 +333,7 @@ else:
                     st = os.stat(f)
                 except OSError:
                     continue
-                if stat.S_IMODE(st[stat.ST_MODE]) & 0111:
+                if stat.S_IMODE(st[stat.ST_MODE]) & 0o111:
                     return f
         return None
 
@@ -566,7 +571,7 @@ else:
 
         base = os.path.join(base, os.path.split(url)[1])
         if printcommand:
-            print command
+            print(command)
         if execute_tests:
             os.system(command)
     else:
@@ -795,15 +800,15 @@ def run_test(t, io_lock, async=True):
     if suppress_stdout or suppress_stderr:
         sys.stdout.write(header)
     if not suppress_stdout and t.stdout:
-        print t.stdout
+        print(t.stdout)
     if not suppress_stderr and t.stderr:
-        print t.stderr
+        print(t.stderr)
     print_time_func("Test execution time: %.1f seconds\n", t.test_time)
     if io_lock:
         io_lock.release()
     if quit_on_failure and t.status == 1:
-        print "Exiting due to error"
-        print t.status
+        print("Exiting due to error")
+        print(t.status)
         sys.exit(1)
 
 class RunTest(threading.Thread):
@@ -819,9 +824,9 @@ class RunTest(threading.Thread):
             self.queue.task_done()
 
 if jobs > 1 and threading_ok:
-    print "Running tests using %d jobs"%jobs
+    print("Running tests using %d jobs"%jobs)
     # Start worker threads
-    queue = Queue.Queue()
+    queue = Queue()
     io_lock = threading.Lock()
     for i in range(1, jobs):
         t = RunTest(queue, io_lock)
@@ -834,7 +839,7 @@ if jobs > 1 and threading_ok:
 else:
     # Run tests serially
     if jobs > 1:
-        print "Ignoring -j%d option; no python threading module available."%jobs
+        print("Ignoring -j%d option; no python threading module available."%jobs)
     for t in tests:
         run_test(t, None, False)