[MOAB-dev] r5815 - in MOAB/trunk: itaps/imesh test test/io tools/dagmc

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-10-19 14:17:21 -0500 (Fri, 19 Oct 2012)
New Revision: 5815

Modified:
   MOAB/trunk/itaps/imesh/MOAB_iMesh_unit_tests.cpp
   MOAB/trunk/test/MBTest.cpp
   MOAB/trunk/test/Makefile.am
   MOAB/trunk/test/io/Makefile.am
   MOAB/trunk/tools/dagmc/Makefile.am
Log:
fix moab-bare build, by not running tests that 
depend on reading/writing hdf5 or netcdf files


Modified: MOAB/trunk/itaps/imesh/MOAB_iMesh_unit_tests.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/MOAB_iMesh_unit_tests.cpp	2012-10-19 18:47:23 UTC (rev 5814)
+++ MOAB/trunk/itaps/imesh/MOAB_iMesh_unit_tests.cpp	2012-10-19 19:17:21 UTC (rev 5815)
@@ -22,8 +22,9 @@
   REGISTER_TEST( test_getEntArrAdj_invalid_size );
   REGISTER_TEST( test_getEntArrAdj_none );
   REGISTER_TEST( test_existinterface );
+#ifdef  HDF5_FILE
   REGISTER_TEST( test_tags_retrieval );
-
+#endif
   return RUN_TESTS( argc, argv ); 
 }
 

Modified: MOAB/trunk/test/MBTest.cpp
===================================================================
--- MOAB/trunk/test/MBTest.cpp	2012-10-19 18:47:23 UTC (rev 5814)
+++ MOAB/trunk/test/MBTest.cpp	2012-10-19 19:17:21 UTC (rev 5815)
@@ -86,7 +86,7 @@
             std::cerr << "Test failed at " __FILE__ ":" << __LINE__ << std::endl; \
             return MB_FAILURE; } } while(false)
 
-
+#if NETCDF_FILE
 ErrorCode load_file_one( Interface* iface )
 {
   std::string file_name = TestDir + "/mbtest1.g";
@@ -99,6 +99,7 @@
   }
   return error;
 }
+#endif
 
 /* Create a regular 2x2x2 hex mesh */
 ErrorCode create_some_mesh( Interface* iface );
@@ -514,7 +515,7 @@
   
   return MB_SUCCESS;
 }
-  
+#if NETCDF_FILE
 ErrorCode mb_adjacencies_test() 
 {
   Core moab;
@@ -663,6 +664,8 @@
   return result;
 
 }
+