[cig-commits] r13252 - in cs/cigma/trunk: . src tests

[luis at geodynamics.org]

Author: luis
Date: 2008-11-04 01:49:03 -0800 (Tue, 04 Nov 2008)
New Revision: 13252

Modified:
   cs/cigma/trunk/Makefile.am
   cs/cigma/trunk/src/py_cigma_setup.py
   cs/cigma/trunk/tests/test_registry.cpp
Log:
Forgot to include test data in cigma tar.gz file

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-11-04 09:49:01 UTC (rev 13251)
+++ cs/cigma/trunk/Makefile.am	2008-11-04 09:49:03 UTC (rev 13252)
@@ -17,6 +17,7 @@
 # Additional files to include in tarball
 EXTRA_DIST =
 
+
 ###############################################################################
 # Main source
 
@@ -207,13 +208,11 @@
 	src/cli_list_cmd.cpp \
 	src/cigma.cpp
 
+#EXTRA_DIST +=
+
 # }}}
 
 
-#EXTRA_DIST =
-
-
-
 ###############################################################################
 # Python module
 
@@ -249,11 +248,13 @@
 	src/numpy_util.cpp \
 	src/py_Common.h \
 	src/py_Common.cpp \
+	src/py_Exception.cpp \
 	src/py_DataPath.cpp \
 	src/py_Point.h \
 	src/py_Point.cpp \
 	src/py_Points.h \
 	src/py_Points.cpp \
+	src/py_Cell.h \
 	src/py_Cell.cpp \
 	src/py_Quadrature.h \
 	src/py_Quadrature.cpp \
@@ -269,6 +270,7 @@
 	src/py_FE.cpp \
 	src/py_DofHandler.h \
 	src/py_DofHandler.cpp \
+	src/py_Function.h \
 	src/py_Function.cpp \
 	src/py_Field.h \
 	src/py_Field.cpp \
@@ -283,6 +285,7 @@
 	src/py_ExtractOp.cpp \
 	src/py_ListOp.cpp \
 	src/py_Misc.cpp \
+	src/py_Hello.cpp \
 	src/py_cigma_module.cpp
 
 #_cigma.so: $(_cigma_so_OBJS) 
@@ -295,6 +298,7 @@
 
 # }}}
 
+
 ###############################################################################
 # Unit tests
 
@@ -307,7 +311,7 @@
 	$(check_PROGRAMS) \
 	$(top_srcdir)/tests/pytests/runner.py
 
-# cigma-test executable {{{
+# cigma tests {{{
 
 ## Compiler/Linker Options
 
@@ -336,6 +340,8 @@
 	tests/libcigma/CellTest.cpp \
 	tests/libcigma/QuadratureTest.h \
 	tests/libcigma/QuadratureTest.cpp \
+	tests/libcigma/FE_Test.h \
+	tests/libcigma/FE_Test.cpp \
 	tests/libcigma/NodeCoordinatesTest.h \
 	tests/libcigma/NodeCoordinatesTest.cpp \
 	tests/libcigma/ElementBlockTest.h \
@@ -344,8 +350,6 @@
 	tests/libcigma/MeshPartTest.cpp \
 	tests/libcigma/LocatorTest.h \
 	tests/libcigma/LocatorTest.cpp \
-	tests/libcigma/FE_Test.h \
-	tests/libcigma/FE_Test.cpp \
 	tests/libcigma/DofHandlerTest.h \
 	tests/libcigma/DofHandlerTest.cpp \
 	tests/libcigma/FunctionTest.h \
@@ -369,8 +373,52 @@
 	tests/test_registry.cpp \
 	tests/main.cpp
 
+# python tests
+EXTRA_DIST += \
+	tests/pytests/test_cigma.py \
+	tests/pytests/test_point.py \
+	tests/pytests/test_points.py \
+	tests/pytests/test_cell.py \
+	tests/pytests/test_quadrature.py \
+	tests/pytests/test_fe.py \
+	tests/pytests/test_mesh_part.py \
+	tests/pytests/test_locator.py \
+	tests/pytests/test_dof_handler.py \
+	tests/pytests/test_function.py \
+	tests/pytests/test_field.py \
+	tests/pytests/test_residuals.py \
+	tests/pytests/test_reader.py \
+	tests/pytests/test_writer.py \
+	tests/pytests/test_compare.py \
+	tests/pytests/test_eval.py \
+	tests/pytests/test_extract.py \
+	tests/pytests/runner.py
+
+# test data
+EXTRA_DIST += \
+	tests/data/brick1/brick1.jou \
+	tests/data/brick1/brick1.exo \
+	tests/data/brick1/brick1.py \
+	tests/data/brick1/brick1_connect.dat \
+	tests/data/brick1/brick1_coords.dat \
+	tests/data/brick1/brick1.h5 \
+	tests/data/brick1/brick1.vtk \
+	tests/data/brick2/brick2.jou \
+	tests/data/brick2/brick2.exo \
+	tests/data/brick2/brick2.py \
+	tests/data/brick2/brick2.h5 \
+	tests/data/brick2/brick2_coords.dat \
+	tests/data/brick2/brick2_connect.dat \
+	tests/data/brick2/brick2.vtk \
+	tests/data/README
+
+# additional files
+#EXTRA_DIST += \
+#	tests/README
+
 # }}}
 
+
 ###############################################################################
 # Additional makefile rules
 

Modified: cs/cigma/trunk/src/py_cigma_setup.py
===================================================================
--- cs/cigma/trunk/src/py_cigma_setup.py	2008-11-04 09:49:01 UTC (rev 13251)
+++ cs/cigma/trunk/src/py_cigma_setup.py	2008-11-04 09:49:03 UTC (rev 13252)
@@ -19,15 +19,14 @@
     'py_cigma_module.cpp',
     'py_Common.cpp',
     'py_Exception.cpp',
-    'py_Hello.cpp',
     'py_DataPath.cpp',
     'py_Point.cpp',
     'py_Points.cpp',
     'py_Cell.cpp',
     'py_Quadrature.cpp',
-    'py_Locator.cpp',
     'py_ElementBlock.cpp',
     'py_NodeCoordinates.cpp',
+    'py_Locator.cpp',
     'py_MeshPart.cpp',
     'py_FE.cpp',
     'py_DofHandler.cpp',
@@ -41,6 +40,7 @@
     'py_ExtractOp.cpp',
     'py_ListOp.cpp',
     'py_Misc.cpp',
+    'py_Hello.cpp',
 ]
 
 setup(name          = "_cigma",

Modified: cs/cigma/trunk/tests/test_registry.cpp
===================================================================
--- cs/cigma/trunk/tests/test_registry.cpp	2008-11-04 09:49:01 UTC (rev 13251)
+++ cs/cigma/trunk/tests/test_registry.cpp	2008-11-04 09:49:03 UTC (rev 13252)
@@ -21,6 +21,9 @@
 #include <libcigma/QuadratureTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION(libcigma::QuadratureTest);
 
+#include <libcigma/FE_Test.h>
+CPPUNIT_TEST_SUITE_REGISTRATION(libcigma::FE_Test);
+
 #include <libcigma/NodeCoordinatesTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION(libcigma::NodeCoordinatesTest);
 
@@ -33,9 +36,6 @@
 #include <libcigma/LocatorTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION(libcigma::LocatorTest);
 
-#include <libcigma/FE_Test.h>
-CPPUNIT_TEST_SUITE_REGISTRATION(libcigma::FE_Test);
-
 #include <libcigma/DofHandlerTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION(libcigma::DofHandlerTest);