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

3 files changed, 35 insertions, 32 deletions

diff --git a/test/Configure/ConfigureDryRunError.py b/test/Configure/ConfigureDryRunError.py
index b4be67e2..fa85042c 100644
--- a/test/Configure/ConfigureDryRunError.py
+++ b/test/Configure/ConfigureDryRunError.py
@@ -21,6 +21,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+from __future__ import print_function
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -97,7 +98,7 @@ test.checkLogAndStdout( ["Checking for C library %s... " % lib,
 
 newLog = test.read(test.workpath('config.log'))
 if newLog != oldLog:
-    print "Unexpected update of log file within a dry run"
+    print("Unexpected update of log file within a dry run")
     test.fail_test()
 
 test.pass_test()
diff --git a/test/Configure/config-h.py b/test/Configure/config-h.py
index cda6c3b9..ed950552 100644
--- a/test/Configure/config-h.py
+++ b/test/Configure/config-h.py
@@ -21,6 +21,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+from __future__ import print_function
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -135,19 +136,19 @@ test.run(stdout=expected_stdout)
 
 config_h = test.read(test.workpath('config.h'))
 if expected_config_h != config_h:
-    print "Unexpected config.h"
-    print "Expected: "
-    print "---------------------------------------------------------"
-    print repr(expected_config_h)
-    print "---------------------------------------------------------"
-    print "Found: "
-    print "---------------------------------------------------------"
-    print repr(config_h)
-    print "---------------------------------------------------------"
-    print "Stdio: "
-    print "---------------------------------------------------------"
-    print test.stdout()
-    print "---------------------------------------------------------"
+    print("Unexpected config.h")
+    print("Expected: ")
+    print("---------------------------------------------------------")
+    print(repr(expected_config_h))
+    print("---------------------------------------------------------")
+    print("Found: ")
+    print("---------------------------------------------------------")
+    print(repr(config_h))
+    print("---------------------------------------------------------")
+    print("Stdio: ")
+    print("---------------------------------------------------------")
+    print(test.stdout())
+    print("---------------------------------------------------------")
     test.fail_test()
 
 expected_read_str = re.sub(r'\b((yes)|(no))\b',
@@ -162,19 +163,19 @@ test.run(stdout=expected_stdout)
 
 config_h = test.read(test.workpath('config.h'))    
 if expected_config_h != config_h:
-    print "Unexpected config.h"
-    print "Expected: "
-    print "---------------------------------------------------------"
-    print repr(expected_config_h)
-    print "---------------------------------------------------------"
-    print "Found: "
-    print "---------------------------------------------------------"
-    print repr(config_h)
-    print "---------------------------------------------------------"
-    print "Stdio: "
-    print "---------------------------------------------------------"
-    print test.stdout()
-    print "---------------------------------------------------------"
+    print("Unexpected config.h")
+    print("Expected: ")
+    print("---------------------------------------------------------")
+    print(repr(expected_config_h))
+    print("---------------------------------------------------------")
+    print("Found: ")
+    print("---------------------------------------------------------")
+    print(repr(config_h))
+    print("---------------------------------------------------------")
+    print("Stdio: ")
+    print("---------------------------------------------------------")
+    print(test.stdout())
+    print("---------------------------------------------------------")
     test.fail_test()
 
 test.pass_test()
diff --git a/test/Configure/implicit-cache.py b/test/Configure/implicit-cache.py
index 0f04b1e4..1a9ff343 100644
--- a/test/Configure/implicit-cache.py
+++ b/test/Configure/implicit-cache.py
@@ -21,6 +21,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+from __future__ import print_function
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -93,11 +94,11 @@ test.run_sconsign('-d .sconf_temp -e conftest_0.c --raw .sconsign.dblite')
 new_sconsign_dblite = test.stdout()
 
 if old_sconsign_dblite != new_sconsign_dblite:
-    print ".sconsign.dblite did not match:"
-    print "FIRST RUN =========="
-    print old_sconsign_dblite
-    print "SECOND RUN =========="
-    print new_sconsign_dblite
+    print(".sconsign.dblite did not match:")
+    print("FIRST RUN ==========")
+    print(old_sconsign_dblite)
+    print("SECOND RUN ==========")
+    print(new_sconsign_dblite)
     test.fail_test()
 
 test.pass_test()