[cig-commits] r7306 - short/3D/PyLith/trunk/unittests/pytests/meshio

[brad at geodynamics.org]

Author: brad
Date: 2007-06-19 13:16:32 -0700 (Tue, 19 Jun 2007)
New Revision: 7306

Modified:
   short/3D/PyLith/trunk/unittests/pytests/meshio/Makefile.am
   short/3D/PyLith/trunk/unittests/pytests/meshio/testdriver.py
Log:
Added guard against running tests on Cubit importer when CUBIT is not enabled.

Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/Makefile.am	2007-06-19 19:40:49 UTC (rev 7305)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/Makefile.am	2007-06-19 20:16:32 UTC (rev 7306)
@@ -17,14 +17,21 @@
 
 TESTS = testdriver.py
 
-check_SCRIPTS = testdriver.py
+check_SCRIPTS = testdriver.py 
 
 noinst_PYTHON = \
 	TestMeshIOAscii.py \
 	TestMeshIOCubit.py \
 	TestMeshIOLagrit.py
 
+if ENABLE_CUBIT
+  TESTS += testdriver_cubit.py
+  check_SCRIPTS += testdriver_cubit.py
+endif	
+
 TESTS_ENVIRONMENT = $(PYTHON)
 
 
+
+
 # End of file 

Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/testdriver.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/testdriver.py	2007-06-19 19:40:49 UTC (rev 7305)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/testdriver.py	2007-06-19 20:16:32 UTC (rev 7306)
@@ -57,9 +57,6 @@
     from TestMeshIOAscii import TestMeshIOAscii
     suite.addTest(unittest.makeSuite(TestMeshIOAscii))
 
-    from TestMeshIOCubit import TestMeshIOCubit
-    suite.addTest(unittest.makeSuite(TestMeshIOCubit))
-
     from TestMeshIOLagrit import TestMeshIOLagrit
     suite.addTest(unittest.makeSuite(TestMeshIOLagrit))