[cig-commits] r7067 - in short/3D/PyLith/trunk/unittests/libtests/materials: . data

[brad at geodynamics.org]

Author: brad
Date: 2007-06-05 07:46:37 -0700 (Tue, 05 Jun 2007)
New Revision: 7067

Modified:
   short/3D/PyLith/trunk/unittests/libtests/materials/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc
   short/3D/PyLith/trunk/unittests/libtests/materials/data/Makefile.am
Log:
Fixed compilation of libtests for materials.

Modified: short/3D/PyLith/trunk/unittests/libtests/materials/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/Makefile.am	2007-06-05 04:05:38 UTC (rev 7066)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/Makefile.am	2007-06-05 14:46:37 UTC (rev 7067)
@@ -29,7 +29,6 @@
 	TestElasticStrain1D.cc \
 	TestElasticStress1D.cc \
 	TestMaxwellIsotropic3D.cc \
-	TestElasticPlaneStrain.cc \
 	test_materials.cc
 
 noinst_HEADERS = \

Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc	2007-06-05 04:05:38 UTC (rev 7066)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc	2007-06-05 14:46:37 UTC (rev 7067)
@@ -161,11 +161,11 @@
 
   const double dt1 = 1.0;
   material.timeStep(dt1);
-  CPPUNIT_ASSERT_EQUAL(dt1, material.timeStep());
+  CPPUNIT_ASSERT_EQUAL(dt1, material.Material::timeStep());
   CPPUNIT_ASSERT_EQUAL(false, material.needNewJacobian());
 
   const double dt2 = 2.0;
-  CPPUNIT_ASSERT_EQUAL(dt2, material.timeStep());
+  CPPUNIT_ASSERT_EQUAL(dt2, material.Material::timeStep());
   CPPUNIT_ASSERT_EQUAL(true, material.needNewJacobian());
 } // testTimeStep
 

Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/Makefile.am	2007-06-05 04:05:38 UTC (rev 7066)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/Makefile.am	2007-06-05 14:46:37 UTC (rev 7067)
@@ -23,8 +23,7 @@
 BUILT_SOURCES = export-data
 
 CLEANFILES = \
-	$(export_datadir)/$(noinst_DATA) \
-	$(export_datadir)/$(noinst_TMP)
+	$(export_datadir)/$(noinst_DATA)
 
 
 # End of file