[cig-commits] commit: Merge.

[Mercurial]

changeset:   232:7293b35b7ee2
parent:      224:5f69c7287587
parent:      229:0ec60f76fd47
user:        JericoRevote
date:        Wed Jan 06 15:13:51 2010 +1100
files:       SConfigure
description:
Merge.


diff -r 5f69c7287587 -r 7293b35b7ee2 SConfigure
--- a/SConfigure	Wed Jan 06 13:46:36 2010 +1100
+++ b/SConfigure	Wed Jan 06 15:13:51 2010 +1100
@@ -164,8 +164,8 @@ if not (GetOption('help') or GetOption('
     env.ConfigurePackage(packages.PETSc)
     env.ConfigurePackage(packages.PETScExt, required=False)
 
-    # enable all warning except -Wwrite-strings. StGermain API needs modifying.
-    env.MergeFlags('-Wall -Wno-write-strings')
+    # enable all warnings.
+    env.MergeFlags('-Wall')
     if env.get('CC', None) == 'icc':
         env.MergeFlags('-wd869 -wd1419')
 
diff -r 5f69c7287587 -r 7293b35b7ee2 SConstruct
--- a/SConstruct	Wed Jan 06 13:46:36 2010 +1100
+++ b/SConstruct	Wed Jan 06 15:13:51 2010 +1100
@@ -142,3 +142,16 @@ env.Dist("underworld-%s"%env.GetOption("
          ["configure.py", "SConstruct", "config", "script", "StGermain",
           "StgDomain", "StgFEM", "PICellerator", "Underworld",
           "Experimental", "gLucifer"])
+
+#
+# SCons check-related help options.
+#
+Help("""
+SCons-Check Options:
+    Type: './scons.py check' to run the stgUnderworld unit and low-res integration tests only,
+          './scons.py check-complete' to run the stgUnderworld unit, convergence, low-res and normal-res integration tests,
+          './scons.py check-unit' to run the stgUnderworld unit tests only,
+          './scons.py check-convergence' to run the stgUnderworld convergence tests only,
+          './scons.py check-integration' to run the normal-res integration tests,
+          './scons.py check-lowres' to run the low-res integration tests.
+""")
diff -r 5f69c7287587 -r 7293b35b7ee2 scons.py
--- a/scons.py	Wed Jan 06 13:46:36 2010 +1100
+++ b/scons.py	Wed Jan 06 15:13:51 2010 +1100
@@ -1,6 +1,20 @@
 #!/usr/bin/env python
-import sys, subprocess
+import os, sys, subprocess
 subp = subprocess.Popen(
     'config/scons/scons.py ' + ' '.join(sys.argv[1:]), shell=True
 )
 subp.wait()
+
+# A manual way of displaying the result of the integration and 
+# convergence tests from ./scons.py check*.
+if len( sys.argv ) > 1:
+    if sys.argv[1] >= "check":
+        filename = "summary.dat"
+        if os.path.exists( filename ):
+            FILE = open( filename, "r" )
+            print "--------------------------------------------------------\n" + \
+                  "[SYS] SYSTEM TESTS SUMMARY \n" + \
+                  "--------------------------------------------------------"
+            print FILE.read()
+            FILE.close()
+            os.remove( filename )