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

[walter at geodynamics.org]

Author: walter
Date: 2006-11-09 16:48:37 -0800 (Thu, 09 Nov 2006)
New Revision: 5223

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/src/StGermain/Base/Extensibility/SConscript
Log:
 r1046 at earth:  boo | 2006-11-08 13:50:57 -0800
 Make StGermain/Base/Extensibility tests work



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

Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct	2006-11-10 00:43:33 UTC (rev 5222)
+++ long/3D/Gale/trunk/SConstruct	2006-11-10 00:48:37 UTC (rev 5223)
@@ -201,6 +201,7 @@
 SConscript('build/SConscript')
 make_test_deps=True
 Export('make_test_deps')
+SConscript('build/StGermain/Base/Extensibility/SConscript')
 SConscript('build/StGermain/Base/Automation/SConscript')
 SConscript('build/StGermain/Base/Container/SConscript')
 SConscript('build/StGermain/Base/Foundation/SConscript')

Modified: long/3D/Gale/trunk/src/StGermain/Base/Extensibility/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Extensibility/SConscript	2006-11-10 00:43:33 UTC (rev 5222)
+++ long/3D/Gale/trunk/src/StGermain/Base/Extensibility/SConscript	2006-11-10 00:48:37 UTC (rev 5223)
@@ -15,5 +15,10 @@
 # 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')
+