[cig-commits] r5251 - in long/3D/Gale/trunk: . src/StGermain/Base src/StGermain/Base/tests

[walter at geodynamics.org]

Author: walter
Date: 2006-11-13 13:24:51 -0800 (Mon, 13 Nov 2006)
New Revision: 5251

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/src/StGermain/Base/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/tests/testLibBase.0of1.expected
Log:
 r1068 at earth:  boo | 2006-11-10 12:38:04 -0800
 Make StGermain/Base tests run, and clean up top level tests a bit



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1067
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1068

Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct	2006-11-13 21:24:48 UTC (rev 5250)
+++ long/3D/Gale/trunk/SConstruct	2006-11-13 21:24:51 UTC (rev 5251)
@@ -241,14 +241,7 @@
 SConscript('build/SConscript')
 make_test_deps=True
 Export('make_test_deps')
-SConscript('build/StGermain/Base/IO/SConscript')
-SConscript('build/StGermain/Base/Context/SConscript')
-SConscript('build/StGermain/Base/Extensibility/SConscript')
-SConscript('build/StGermain/Base/Automation/SConscript')
-SConscript('build/StGermain/Base/Container/SConscript')
-SConscript('build/StGermain/Base/Foundation/SConscript')
-SConscript('build/StGermain/Base/FlattenXML/SConscript')
-SConscript('build/StGermain/Base/ListPlugins/SConscript')
+SConscript('build/StGermain/Base/SConscript')
 
 # We have to do a fake install of the headers, because otherwise the
 # libraries won't build.  We have to do a fake install of the

Modified: long/3D/Gale/trunk/src/StGermain/Base/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/SConscript	2006-11-13 21:24:48 UTC (rev 5250)
+++ long/3D/Gale/trunk/src/StGermain/Base/SConscript	2006-11-13 21:24:51 UTC (rev 5251)
@@ -15,7 +15,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-SConscript('src/SConscript')
+Import('make_test_deps')
+
+if not make_test_deps:
+    SConscript('src/SConscript')
+else:
+    SConscript('tests/SConscript')
+
 SConscript('IO/SConscript')
 SConscript('Context/SConscript')
 SConscript('Extensibility/SConscript')

Modified: long/3D/Gale/trunk/src/StGermain/Base/tests/testLibBase.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/tests/testLibBase.0of1.expected	2006-11-13 21:24:48 UTC (rev 5250)
+++ long/3D/Gale/trunk/src/StGermain/Base/tests/testLibBase.0of1.expected	2006-11-13 21:24:51 UTC (rev 5251)
@@ -1,2 +1 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
 Watching rank: 0