[MOAB-dev] r4492 - in MOAB/trunk: MeshFiles/unittest tools/mbfacetgeom

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-02-14 17:05:37 -0600 (Mon, 14 Feb 2011)
New Revision: 4492

Added:
   MOAB/trunk/MeshFiles/unittest/PB.h5m
Modified:
   MOAB/trunk/tools/mbfacetgeom/Makefile.am
   MOAB/trunk/tools/mbfacetgeom/mbfacet_test.cpp
Log:
put the default test file in the unittest folder


Added: MOAB/trunk/MeshFiles/unittest/PB.h5m
===================================================================
(Binary files differ)


Property changes on: MOAB/trunk/MeshFiles/unittest/PB.h5m
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: MOAB/trunk/tools/mbfacetgeom/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbfacetgeom/Makefile.am	2011-02-14 21:28:51 UTC (rev 4491)
+++ MOAB/trunk/tools/mbfacetgeom/Makefile.am	2011-02-14 23:05:37 UTC (rev 4492)
@@ -1,5 +1,8 @@
 
+MESHDIR = $(top_srcdir)/MeshFiles/unittest
+
 AM_CPPFLAGS += -DIS_BUILDING_MB\
+               -DMESHDIR=$(MESHDIR) \
                -I$(top_srcdir)/src \
                -I$(top_builddir)/src 
 

Modified: MOAB/trunk/tools/mbfacetgeom/mbfacet_test.cpp
===================================================================
--- MOAB/trunk/tools/mbfacetgeom/mbfacet_test.cpp	2011-02-14 21:28:51 UTC (rev 4491)
+++ MOAB/trunk/tools/mbfacetgeom/mbfacet_test.cpp	2011-02-14 23:05:37 UTC (rev 4492)
@@ -24,6 +24,14 @@
 #include <math.h>
 #include "FBEngine.hpp"
 
+#define STRINGIFY_(A) #A
+#define STRINGIFY(A) STRINGIFY_(A)
+#ifdef MESHDIR
+std::string TestDir( STRINGIFY(MESHDIR) );
+#else
+std::string TestDir( "." );
+#endif
+
 #define PROCESS_ERROR(A, B)  {if (A!=MB_SUCCESS) {  std::cout << B << std::endl; return 1; } }
 
 #define CHECK( STR ) if (rval != MB_SUCCESS) return print_error( STR, rval, __FILE__, __LINE__ )
@@ -54,7 +62,7 @@
 }
 
 int main(int argc, char *argv[]) {
-  std::string filename = "PB.h5m";
+  std::string filename = TestDir + "/PB.h5m";
   std::string engine_opt;