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

[walter at geodynamics.org]

Author: walter
Date: 2006-11-09 16:43:33 -0800 (Thu, 09 Nov 2006)
New Revision: 5222

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/src/StGermain/Base/Automation/SConscript
   long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testComponentMetadata.c
   long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testVariableDumpStream.c
Log:
 r1045 at earth:  boo | 2006-11-08 13:37:23 -0800
 Make StGermain/Base/Automation tests work



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

Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct	2006-11-10 00:43:31 UTC (rev 5221)
+++ long/3D/Gale/trunk/SConstruct	2006-11-10 00:43:33 UTC (rev 5222)
@@ -201,8 +201,9 @@
 SConscript('build/SConscript')
 make_test_deps=True
 Export('make_test_deps')
+SConscript('build/StGermain/Base/Automation/SConscript')
+SConscript('build/StGermain/Base/Container/SConscript')
 SConscript('build/StGermain/Base/Foundation/SConscript')
-SConscript('build/StGermain/Base/Container/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/Automation/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/SConscript	2006-11-10 00:43:31 UTC (rev 5221)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/SConscript	2006-11-10 00:43:33 UTC (rev 5222)
@@ -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')
+

Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testComponentMetadata.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testComponentMetadata.c	2006-11-10 00:43:31 UTC (rev 5221)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testComponentMetadata.c	2006-11-10 00:43:33 UTC (rev 5222)
@@ -92,7 +92,7 @@
 
 		allDict = Dictionary_New();
 		io = XML_IO_Handler_New();
-		IO_Handler_ReadAllFromFile( io, "data/metatest.xml", allDict );
+		IO_Handler_ReadAllFromFile( io, "src/StGermain/Base/Automation/tests/data/metatest.xml", allDict );
 		compDict = Dictionary_GetDictionary( allDict, "components" );
 		vc = CompositeVC_DefaultNew( "vc" );	
 		

Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testVariableDumpStream.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testVariableDumpStream.c	2006-11-10 00:43:31 UTC (rev 5221)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testVariableDumpStream.c	2006-11-10 00:43:33 UTC (rev 5222)
@@ -114,13 +114,13 @@
 		}
 
 		dumpStream = Journal_Register( VariableDumpStream_Type, "scalar dump" );
-		VariableDumpStream_SetVariable( dumpStream, var, 1, 0, "data/scalardump.dat" );
+		VariableDumpStream_SetVariable( dumpStream, var, 1, 0, "src/StGermain/Base/Automation/tests/data/scalardump.dat" );
 
 		Journal_Printf( stream, "Dumping scalar\n" );
 		Journal_Dump( dumpStream, NULL );
 
 		dumpStream = Journal_Register( VariableDumpStream_Type, "vector dump" );
-		VariableDumpStream_SetVariable( dumpStream, vec, 1, 0, "data/vectordump.dat" );
+		VariableDumpStream_SetVariable( dumpStream, vec, 1, 0, "src/StGermain/Base/Automation/tests/data/vectordump.dat" );
 
 		Journal_Printf( stream, "Dumping vector\n" );
 		Journal_Dump( dumpStream, NULL );