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

[walter at geodynamics.org]

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

Added:
   long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/tests/SConscript
Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/tests/testListPlugins.0of1.expected
Log:
 r1067 at earth:  boo | 2006-11-10 12:21:58 -0800
 Add ListPlugins test



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

Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct	2006-11-13 21:24:44 UTC (rev 5249)
+++ long/3D/Gale/trunk/SConstruct	2006-11-13 21:24:48 UTC (rev 5250)
@@ -248,6 +248,7 @@
 SConscript('build/StGermain/Base/Container/SConscript')
 SConscript('build/StGermain/Base/Foundation/SConscript')
 SConscript('build/StGermain/Base/FlattenXML/SConscript')
+SConscript('build/StGermain/Base/ListPlugins/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/ListPlugins/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/SConscript	2006-11-13 21:24:44 UTC (rev 5249)
+++ long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/SConscript	2006-11-13 21:24:48 UTC (rev 5250)
@@ -15,5 +15,9 @@
 # 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')

Modified: long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/src/SConscript	2006-11-13 21:24:44 UTC (rev 5249)
+++ long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/src/SConscript	2006-11-13 21:24:48 UTC (rev 5250)
@@ -19,7 +19,9 @@
 
 local_env=env.Copy()
 
-bin_objects+=[local_env.Program('ListPlugins',
-                                ['main.c',libs(shared_lib_objects,
-                                               StGermain_static_objects)])]
+ListPlugins=local_env.Program('ListPlugins',
+                              ['main.c',libs(shared_lib_objects,
+                                             StGermain_static_objects)])
+bin_objects+=[ListPlugins]
 
+Export('ListPlugins')

Added: long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/tests/SConscript	2006-11-13 21:24:44 UTC (rev 5249)
+++ long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/tests/SConscript	2006-11-13 21:24:48 UTC (rev 5250)
@@ -0,0 +1,27 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','tests','ListPlugins')
+
+local_env=env.Copy()
+
+local_env['TESTARGS']=['data/pluginstest.xml']
+import os
+local_env['TESTDIR']=os.getcwd()
+flatten_test=local_env.GeneralTest([ListPlugins,"testListPlugins.0of1.expected"])
+tests+=[flatten_test]
+

Modified: long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/tests/testListPlugins.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/tests/testListPlugins.0of1.expected	2006-11-13 21:24:44 UTC (rev 5249)
+++ long/3D/Gale/trunk/src/StGermain/Base/ListPlugins/tests/testListPlugins.0of1.expected	2006-11-13 21:24:48 UTC (rev 5250)
@@ -1,4 +1,3 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
 LocalPlugin
 LocalPlugin1
 LocalPlugin2