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

[walter at geodynamics.org]

Author: walter
Date: 2006-11-14 03:21:42 -0800 (Tue, 14 Nov 2006)
New Revision: 5260

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/src/StGermain/Discretisation/tests/testLibDiscretisation.0of1.expected
Log:
 r1079 at earth:  boo | 2006-11-14 02:53:21 -0800
 Make all StGermain/Discretisation tests run



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

Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct	2006-11-14 03:25:28 UTC (rev 5259)
+++ long/3D/Gale/trunk/SConstruct	2006-11-14 11:21:42 UTC (rev 5260)
@@ -246,11 +246,7 @@
 SConscript('build/SConscript')
 make_test_deps=True
 Export('make_test_deps')
-SConscript('build/StGermain/Discretisation/Utils/SConscript')
-SConscript('build/StGermain/Discretisation/Swarm/SConscript')
-SConscript('build/StGermain/Discretisation/Geometry/SConscript')
-SConscript('build/StGermain/Discretisation/Mesh/SConscript')
-SConscript('build/StGermain/Discretisation/Shape/SConscript')
+SConscript('build/StGermain/Discretisation/SConscript')
 SConscript('build/StGermain/Base/SConscript')
 
 # We have to do a fake install of the headers, because otherwise the

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/tests/testLibDiscretisation.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/tests/testLibDiscretisation.0of1.expected	2006-11-14 03:25:28 UTC (rev 5259)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/tests/testLibDiscretisation.0of1.expected	2006-11-14 11:21:42 UTC (rev 5260)
@@ -1,3 +1 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
-StGermain Discretisation Library. Copyright (C) 2003-2005 VPAC.
 Watching rank: 0