[cig-commits] r5940 - in short/3D/PyLith/trunk/unittests/libtests: feassemble meshio

[leif at geodynamics.org]

Author: leif
Date: 2007-01-30 18:08:21 -0800 (Tue, 30 Jan 2007)
New Revision: 5940

Modified:
   short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/feassemble/TestIntegrator.cc
   short/3D/PyLith/trunk/unittests/libtests/feassemble/test_feassemble.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/meshio/test_meshio.cc
Log:
Broke libtests -> libjournal dependency, as CIG-Pythia does not
support using 'journal' without a Python interpreter.  If we really
need 'journal' here, we can run the tests under Python.

~~~~~

N.B.: No functionaliy has been lost here.  The "standalone" C++
'journal' from CACR is little more than a glorifed wrapper around
std::iostream.  In the absence of a Python interpreter, CACR-journal
has the following limitations:

*) It can only write to std::cout.  There is no built-in output
 redirection; it can't even redirect to a file.  (Observe that
 journal::StreamDevice has only a single subclass in standalone mode:
 journal::Console.)

*) Output can only be turned on and off explicitly in the code, using
 activate() or deactivate().  There is no control from the command
 line, environment variables, configuration files, or otherwise.

Since the power of C++ journal is only unleashed in the context of a
Python interpreter (where it has access to its Pyre-based
counterpart), CIG-Pythia supports only the Python mode of operation --
it dispenses with the "standalone" (==crippled) journal.


Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am	2007-01-31 00:44:34 UTC (rev 5939)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am	2007-01-31 02:08:21 UTC (rev 5940)
@@ -98,11 +98,9 @@
 	data/QuadratureData3DLinear.hh \
 	data/QuadratureData3DQuadratic.hh
 
-testfeassemble_LDFLAGS = $(PETSC_LIB) \
-	-ljournal
+testfeassemble_LDFLAGS = $(PETSC_LIB)
 
-INCLUDES += $(PETSC_INCLUDE)
-AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
+AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS) $(PETSC_INCLUDE)
 
 testfeassemble_LDADD = \
 	-lcppunit -ldl \

Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestIntegrator.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestIntegrator.cc	2007-01-31 00:44:34 UTC (rev 5939)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestIntegrator.cc	2007-01-31 02:08:21 UTC (rev 5940)
@@ -18,8 +18,6 @@
 #include "pylith/feassemble/Quadrature1D.hh" // USES Quadrature1D
 #include "data/IntegratorData.hh" // USES IntegratorData
 
-#include "journal/debug.h"
-
 #include <petscmat.h>
 
 // ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/test_feassemble.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/test_feassemble.cc	2007-01-31 00:44:34 UTC (rev 5939)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/test_feassemble.cc	2007-01-31 02:08:21 UTC (rev 5940)
@@ -23,15 +23,10 @@
 
 #include <stdlib.h> // USES abort()
 
-#include "journal/debug.h"
-
 int
 main(int argc,
      char* argv[])
 { // main
-  journal::debug_t debug("TestIntegrator");
-  debug.deactivate();
-
   CppUnit::TestResultCollector result;
 
   try {

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am	2007-01-31 00:44:34 UTC (rev 5939)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am	2007-01-31 02:08:21 UTC (rev 5940)
@@ -46,11 +46,9 @@
 	data/MeshData2Din3D.hh \
 	data/MeshData3D.hh
 
-testmeshio_LDFLAGS = $(PETSC_LIB) \
-	-ljournal
+testmeshio_LDFLAGS = $(PETSC_LIB)
 
-INCLUDES += $(PETSC_INCLUDE)
-AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
+AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS) $(PETSC_INCLUDE)
 
 testmeshio_LDADD = \
 	-lcppunit -ldl \

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/test_meshio.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/test_meshio.cc	2007-01-31 00:44:34 UTC (rev 5939)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/test_meshio.cc	2007-01-31 02:08:21 UTC (rev 5940)
@@ -23,15 +23,10 @@
 
 #include <stdlib.h> // USES abort()
 
-#include "journal/debug.h"
-
 int
 main(int argc,
      char* argv[])
 { // main
-  journal::debug_t debug("TestMeshIOAscii");
-  debug.deactivate();
-
   CppUnit::TestResultCollector result;
 
   try {