[MOAB-dev] r5069 - MOAB/trunk/itaps/imesh

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-07-21 14:09:54 -0500 (Thu, 21 Jul 2011)
New Revision: 5069

Modified:
   MOAB/trunk/itaps/imesh/MOAB_iMesh_unit_tests.cpp
   MOAB/trunk/itaps/imesh/Makefile.am
Log:
define explicitly the path to the mesh files


Modified: MOAB/trunk/itaps/imesh/MOAB_iMesh_unit_tests.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/MOAB_iMesh_unit_tests.cpp	2011-07-21 17:12:25 UTC (rev 5068)
+++ MOAB/trunk/itaps/imesh/MOAB_iMesh_unit_tests.cpp	2011-07-21 19:09:54 UTC (rev 5069)
@@ -424,10 +424,9 @@
 
   // open a file with var len tags (sense tags)
   // they should be filtered out
-  char test_file[] = "../../MeshFiles/unittest/PB.h5m";
+  std::string filename = STRINGIFY(MESHDIR) "/PB.h5m";
 
-  iMesh_load(mesh, root_set, test_file, NULL, &err, strlen(
-      test_file), 0);
+  iMesh_load(mesh, root_set, filename.c_str(), NULL, &err, filename.length(), 0);
   CHECK_EQUAL( iBase_SUCCESS, err );
 
   iBase_EntitySetHandle* contained_set_handles = NULL;

Modified: MOAB/trunk/itaps/imesh/Makefile.am
===================================================================
--- MOAB/trunk/itaps/imesh/Makefile.am	2011-07-21 17:12:25 UTC (rev 5068)
+++ MOAB/trunk/itaps/imesh/Makefile.am	2011-07-21 19:09:54 UTC (rev 5069)
@@ -1,13 +1,16 @@
 BUILT_SOURCES = iMesh_protos.h iMeshP_protos.h iMesh_extensions_protos.h
 
-AM_CPPFLAGS += -DSRCDIR=$(srcdir) \
+MESHDIR = $(top_srcdir)/MeshFiles/unittest
+
+AM_CPPFLAGS += -DSRCDIR=$(srcdir) \    
+               -DMESHDIR=$(MESHDIR) \
                -I$(srcdir)/.. \
                -I$(top_srcdir)/src \
                -I$(top_builddir)/src  \
                -I$(top_srcdir)/test
 
 # stuff for c test program
-check_PROGRAMS = testc_cbind MOAB_iMesh_unit_tests
+check_PROGRAMS = testc_cbind MOAB_iMesh_unit_tests 
 EXTRA_DIST = brick.vtk quad9.cub
 
 libiMesh_la_SOURCES = \