[cig-commits] r5262 - in long/3D/Gale/trunk: . src/StGermain/libStGermain src/StGermain/libStGermain/tests src/StGermain/libStGermain/testsDynamic

Tue Nov 14 03:21:50 PST 2006

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

Added:
   long/3D/Gale/trunk/src/StGermain/libStGermain/tests/SConscript
   long/3D/Gale/trunk/src/StGermain/libStGermain/testsDynamic/SConscript
Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/src/StGermain/libStGermain/SConscript
   long/3D/Gale/trunk/src/StGermain/libStGermain/tests/testLibStGermain.0of1.expected
   long/3D/Gale/trunk/src/StGermain/libStGermain/testsDynamic/testLibStGermainDynamic.0of1.expected
Log:
 r1081 at earth:  boo | 2006-11-14 03:09:39 -0800
 make libStGermain tests run



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

Modified: long/3D/Gale/trunk/SConstruct
===================================================================

--- long/3D/Gale/trunk/SConstruct	2006-11-14 11:21:47 UTC (rev 5261)
+++ long/3D/Gale/trunk/SConstruct	2006-11-14 11:21:50 UTC (rev 5262)
@@ -246,6 +246,7 @@
 SConscript('build/SConscript')
 make_test_deps=True
 Export('make_test_deps')
+SConscript('build/StGermain/libStGermain/SConscript')
 SConscript('build/StGermain/FD/SConscript')
 SConscript('build/StGermain/Discretisation/SConscript')
 SConscript('build/StGermain/Base/SConscript')

Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/SConscript	2006-11-14 11:21:47 UTC (rev 5261)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/SConscript	2006-11-14 11:21:50 UTC (rev 5262)
@@ -15,10 +15,16 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-libStGermain_shared_objects=[]
-Export('libStGermain_shared_objects')
 
-SConscript('src/SConscript')
-SConscript('dynamic/SConscript')
+Import('make_test_deps')
 
+if not make_test_deps:
+    libStGermain_shared_objects=[]
+    Export('libStGermain_shared_objects')
 
+    SConscript('src/SConscript')
+    SConscript('dynamic/SConscript')
+else:
+    SConscript('tests/SConscript')
+    SConscript('testsDyanamic/SConscript')
+

Added: long/3D/Gale/trunk/src/StGermain/libStGermain/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/tests/SConscript	2006-11-14 11:21:47 UTC (rev 5261)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/tests/SConscript	2006-11-14 11:21:50 UTC (rev 5262)
@@ -0,0 +1,26 @@
+# 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','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+
+test_files=Split("""testLibStGermain.c
+""")
+
+add_tests(local_env,tests,test_files,[StGermain_static_library])

Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/tests/testLibStGermain.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/tests/testLibStGermain.0of1.expected	2006-11-14 11:21:47 UTC (rev 5261)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/tests/testLibStGermain.0of1.expected	2006-11-14 11:21:50 UTC (rev 5262)
@@ -1,3 +1 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
-StGermain Discretisation Library. Copyright (C) 2003-2005 VPAC.
 Watching rank: 0

Added: long/3D/Gale/trunk/src/StGermain/libStGermain/testsDynamic/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/testsDynamic/SConscript	2006-11-14 11:21:47 UTC (rev 5261)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/testsDynamic/SConscript	2006-11-14 11:21:50 UTC (rev 5262)
@@ -0,0 +1,26 @@
+# 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','add_tests','StGermain_static_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+
+test_files=Split("""testLibStGermainDynamic.c
+""")
+
+add_tests(local_env,tests,test_files,[StGermain_static_library])

Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/testsDynamic/testLibStGermainDynamic.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/testsDynamic/testLibStGermainDynamic.0of1.expected	2006-11-14 11:21:47 UTC (rev 5261)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/testsDynamic/testLibStGermainDynamic.0of1.expected	2006-11-14 11:21:50 UTC (rev 5262)
@@ -1,3 +1 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
-StGermain Discretisation Library. Copyright (C) 2003-2005 VPAC.
 Watching rank: 0

