[cig-commits] r5229 - in long/3D/Gale/trunk: .
src/StGermain/Base/Automation/tests
src/StGermain/Base/Container/tests src/StGermain/Base/Context/tests
src/StGermain/Base/Extensibility/tests
src/StGermain/Base/Foundation/tests src/StGermain/Base/IO
src/StGermain/Base/IO/tests
src/StGermain/Discretisation/Geometry/src
src/StGermain/libStGermain/dynamic
walter at geodynamics.org
walter at geodynamics.org
Thu Nov 9 16:48:52 PST 2006
Author: walter
Date: 2006-11-09 16:48:51 -0800 (Thu, 09 Nov 2006)
New Revision: 5229
Added:
long/3D/Gale/trunk/src/StGermain/Base/IO/tests/SConscript
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/SConstruct
long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testComponentMetadata.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testVariableDumpStream.c
long/3D/Gale/trunk/src/StGermain/Base/Container/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Base/Context/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Base/Extensibility/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Base/Foundation/tests/SConscript
long/3D/Gale/trunk/src/StGermain/Base/IO/SConscript
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Geometry.h
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
long/3D/Gale/trunk/src/StGermain/libStGermain/dynamic/SConscript
Log:
r1052 at earth: boo | 2006-11-09 16:42:32 -0800
Make IO tests work. This involved making tests run in the subdirectory
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1051
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1052
Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/SConstruct 2006-11-10 00:48:51 UTC (rev 5229)
@@ -112,50 +112,44 @@
class TestError(Exception):
pass
-def execute_test_and_compare(test_args,expected):
+def execute_test_and_compare(test_args,expected,env):
+ current_dir=os.getcwd()
+ # Replace build with src
+ new_dir=os.path.dirname(os.path.abspath('src'+test_args[3][5:]))
+ test_args[3]=str(os.path.abspath(test_args[3]))
+ os.chdir(new_dir)
r,w,e=os.popen3(test_args)
e.readlines()
- output_file=w.readlines()
+ output_file=[w.readlines()]
r.close()
e.close()
w.close()
- f=file(expected)
- expected_file=f.readlines()
- f.close()
+ if(env.has_key('OUTFILES')):
+ outdir=env['OUTDIR']+"/"
+ output_file=[]
+ for out in env['OUTFILES']:
+ f=file(outdir+out)
+ output_file+=[f.readlines()]
+ f.close()
+ os.remove(outdir+out)
+ os.chdir(current_dir)
+
+ expected_file=[]
+ for e in expected:
+ f=file(e)
+ expected_file+=[f.readlines()]
+ f.close()
+
if expected_file!=output_file:
print "expected and result",test_args, expected
raise TestError
-def run_test(target,source,env):
- test_args=[mpirun]
-
- if not env.has_key('MPI_PROCS'):
- env['MPI_PROCS']="1"
- test_args+=["-np",env['MPI_PROCS']]
-
- if not env.has_key('EXPECTED'):
- env['EXPECTED']="./"
-
- testname=str(source[0])
- expected=env['EXPECTED']+testname+".0of"+env['MPI_PROCS']+".expected"
-
- test_args.append(testname)
- if env.has_key('TESTARGS'):
- for s in Split(env['TESTARGS']):
- test_args.append(s)
-
- execute_test_and_compare(test_args,expected)
- return None
-
def gen_test_suffix(env, sources):
if env.has_key('MPI_PROCS'):
return "test"+env['MPI_PROCS']
return ".test"
-
-env['BUILDERS']['Test']=Builder(action=run_test,
- suffix=gen_test_suffix,single_source=True)
def run_general_test(target,source,env):
test_args=[mpirun]
@@ -168,7 +162,9 @@
env['EXPECTED']="./"
testname=str(source[0])
- expected=str(source[1])
+ expected=[]
+ for e in source[1:]:
+ expected+=[str(e)]
test_args.append(testname)
@@ -176,20 +172,58 @@
for s in Split(env['TESTARGS']):
test_args.append(s)
- execute_test_and_compare(test_args,expected)
+ execute_test_and_compare(test_args,expected,env)
return None
env['BUILDERS']['GeneralTest']=Builder(action=run_general_test,
suffix=gen_test_suffix)
-
-def add_tests(env,tests,test_files,libraries,procs):
+def add_tests(env,tests,test_files,libraries,output=""):
+ if not env.has_key('MPI_PROCS'):
+ env['MPI_PROCS']="1"
+ procs=env['MPI_PROCS']
for f in test_files:
- tests+=[env.GeneralTest([env.Program(f[:-2],[f,libraries]),
- f[:-1]+"0of"+procs+".expected"])]
+ if env.has_key('OUTFILES'):
+ if not env.has_key('OUTDIR'):
+ env['OUTDIR']="."
+ outfiles=[]
+ for out in env['OUTFILES']:
+ outfiles+=[f[:-1]+"0of"+procs+"."+out+".expected"]
+ tests+=[env.GeneralTest([env.Program(f[:-2],[f,libraries]),
+ outfiles])]
+ else:
+ tests+=[env.GeneralTest([env.Program(f[:-2],[f,libraries]),
+ f[:-1]+"0of"+procs+".expected"])]
+
+# def run_test(target,source,env):
+# test_args=[mpirun]
+
+# if not env.has_key('MPI_PROCS'):
+# env['MPI_PROCS']="1"
+# test_args+=["-np",env['MPI_PROCS']]
+
+# if not env.has_key('EXPECTED'):
+# env['EXPECTED']="./"
+
+# testname=str(source[0])
+# expected=env['EXPECTED']+testname+".0of"+env['MPI_PROCS']+".expected"
+
+# test_args.append(testname)
+# if env.has_key('TESTARGS'):
+# for s in Split(env['TESTARGS']):
+# test_args.append(s)
+
+# execute_test_and_compare(test_args,expected)
+# return None
+
+# env['BUILDERS']['Test']=Builder(action=run_test,
+# suffix=gen_test_suffix,single_source=True)
+
+
+
Export('env','add_tests')
-BuildDir('build','src',duplicate=0)
+BuildDir('build','src')
# We have to do the dependency checking in two stages, because the
# tests need the libraries in order to build (because otherwise you
@@ -201,6 +235,7 @@
SConscript('build/SConscript')
make_test_deps=True
Export('make_test_deps')
+SConscript('build/StGermain/Base/IO/SConscript')
SConscript('build/StGermain/Base/Context/SConscript')
SConscript('build/StGermain/Base/Extensibility/SConscript')
SConscript('build/StGermain/Base/Automation/SConscript')
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -30,6 +30,6 @@
testVariableAllVC.c
testComponentMetadata.c""")
-add_tests(local_env,tests,test_files,[StGermain_static_library],"1")
+add_tests(local_env,tests,test_files,[StGermain_static_library])
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:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testComponentMetadata.c 2006-11-10 00:48:51 UTC (rev 5229)
@@ -92,7 +92,7 @@
allDict = Dictionary_New();
io = XML_IO_Handler_New();
- IO_Handler_ReadAllFromFile( io, "src/StGermain/Base/Automation/tests/data/metatest.xml", allDict );
+ IO_Handler_ReadAllFromFile( io, "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:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/tests/testVariableDumpStream.c 2006-11-10 00:48:51 UTC (rev 5229)
@@ -114,13 +114,13 @@
}
dumpStream = Journal_Register( VariableDumpStream_Type, "scalar dump" );
- VariableDumpStream_SetVariable( dumpStream, var, 1, 0, "src/StGermain/Base/Automation/tests/data/scalardump.dat" );
+ VariableDumpStream_SetVariable( dumpStream, var, 1, 0, "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, "src/StGermain/Base/Automation/tests/data/vectordump.dat" );
+ VariableDumpStream_SetVariable( dumpStream, vec, 1, 0, "data/vectordump.dat" );
Journal_Printf( stream, "Dumping vector\n" );
Journal_Dump( dumpStream, NULL );
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/tests/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/tests/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -32,4 +32,4 @@
testUIntMap.c
""")
-add_tests(local_env,tests,test_files,[StGermain_static_library],"1")
+add_tests(local_env,tests,test_files,[StGermain_static_library])
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/tests/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/tests/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -29,4 +29,4 @@
testDictionaryCheck.c
""")
-add_tests(local_env,tests,test_files,[StGermain_static_library],"1")
+add_tests(local_env,tests,test_files,[StGermain_static_library])
Modified: long/3D/Gale/trunk/src/StGermain/Base/Extensibility/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Extensibility/tests/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/Extensibility/tests/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -31,4 +31,4 @@
testEntryPoint-printConcise.c
""")
-add_tests(local_env,tests,test_files,[StGermain_static_library],"1")
+add_tests(local_env,tests,test_files,[StGermain_static_library])
Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/tests/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/tests/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -51,5 +51,5 @@
PtrMapWrappers.c"""))
add_tests(local_env,tests,test_files,
- [local_objects,StGermain_static_library],"1")
+ [local_objects,StGermain_static_library])
Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -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')
Added: long/3D/Gale/trunk/src/StGermain/Base/IO/tests/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/tests/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/tests/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -0,0 +1,57 @@
+# 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')
+
+# Import('StGermain_shared_library')
+
+local_env=env.Copy()
+local_env.Append(CPPPATH=["#/build/include/StGermain"])
+
+# Missing tests compare pointers
+test_files=Split("""testDictionary.c
+testIO_Handler-raw_data.c
+testJournal.c
+testJournal-Firewall.c""")
+
+local_objects=local_env.StaticObject(Split("""BTreeWrappers.c
+PtrMapWrappers.c"""))
+
+add_tests(local_env,tests,test_files,
+ [local_objects,StGermain_static_library])
+
+local_env2=local_env.Copy()
+local_env2['MPI_PROCS']="2"
+add_tests(local_env2,tests,["testRankFormatter.c"],
+ [local_objects,StGermain_static_library])
+
+local_env3=local_env.Copy()
+local_env3['OUTDIR']="output"
+local_env3['OUTFILES']=["output.dat"]
+add_tests(local_env3,tests,["testJournalShortcuts.c"],
+ [local_objects,StGermain_static_library])
+
+
+local_env4=local_env.Copy()
+local_env4['MPI_PROCS']="2"
+local_env4['OUTFILES']=["test-mpi1.txt", "test-mpi2.txt"]
+# add_tests(local_env4,tests,["testMPIStream.c"],
+# [local_objects,StGermain_shared_library])
+
+add_tests(local_env4,tests,["testMPIStream.c"],
+ [local_objects,StGermain_static_library])
+
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Geometry.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Geometry.h 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Geometry.h 2006-11-10 00:48:51 UTC (rev 5229)
@@ -69,7 +69,7 @@
#include "ParallelDelaunay.h"
#include "ComplexVectorMath.h"
#include "stg_lapack.h"
- #include "FullTensorMath.h"
+/* #include "FullTensorMath.h" */
#include "TensorMultMath.h"
#include "Init.h"
#include "Finalise.h"
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -27,7 +27,6 @@
Dimension.h
Edge.h
Finalise.h
-FullTensorMath.h
GeometryClass.h
Geometry.h
IJK26Topology.h
@@ -60,7 +59,6 @@
Dimension.c
Edge.c
Finalise.c
-FullTensorMath.c
GeometryClass.c
IJK26Topology.c
IJK6Topology.c
Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/dynamic/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/dynamic/SConscript 2006-11-10 00:48:49 UTC (rev 5228)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/dynamic/SConscript 2006-11-10 00:48:51 UTC (rev 5229)
@@ -23,7 +23,10 @@
c_shared_files=libStGermain_shared_objects+["dummy.c"]
if with_shared:
- shared_lib_objects+=[local_env.SharedLibrary('StGermain',c_shared_files)]
+ StGermain_shared_library=local_env.SharedLibrary('StGermain',
+ c_shared_files)
+ shared_lib_objects+=[StGermain_shared_library]
+ Export('StGermain_shared_library')
StGermain_static_library=local_env.StaticLibrary('StGermain',
StGermain_static_objects)
More information about the cig-commits
mailing list