[MOAB-dev] r4758 - MOAB/trunk/test

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-04-20 15:19:49 -0500 (Wed, 20 Apr 2011)
New Revision: 4758

Modified:
   MOAB/trunk/test/Makefile.am
   MOAB/trunk/test/gttool_test.cpp
Log:
after all, do not keep the output file of the test, by default.



Modified: MOAB/trunk/test/Makefile.am
===================================================================
--- MOAB/trunk/test/Makefile.am	2011-04-20 17:50:02 UTC (rev 4757)
+++ MOAB/trunk/test/Makefile.am	2011-04-20 20:19:49 UTC (rev 4758)
@@ -56,8 +56,7 @@
                    tri_mid_edge_face_nodes.g \
                    mb_stress_out.g \
                    merge_test.ncdf \
-                   tree.h5m \
-                   output.h5m
+                   tree.h5m 
 
 # Tests and such
 

Modified: MOAB/trunk/test/gttool_test.cpp
===================================================================
--- MOAB/trunk/test/gttool_test.cpp	2011-04-20 17:50:02 UTC (rev 4757)
+++ MOAB/trunk/test/gttool_test.cpp	2011-04-20 20:19:49 UTC (rev 4758)
@@ -16,6 +16,7 @@
 
 #include <assert.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "moab/GeomTopoTool.hpp"
 
@@ -41,6 +42,9 @@
   return MB_FAILURE; // must always return false or CHECK macro will break
 }
 
+std::string filename;
+std::string ofile;
+bool remove_output_file;
 ErrorCode geometrize_test(Interface * mb, EntityHandle inputSet);
 
 void handle_error_code(ErrorCode rv, int &number_failed, int &number_successful)
@@ -56,15 +60,19 @@
 
 int main(int argc, char *argv[])
 {
-  std::string filename = TestDir + "/partBed.smf";
-  std::string engine_opt;
+  filename = TestDir + "/partBed.smf";
+  ofile = "output.h5m";
 
+  remove_output_file = true;
+
   if (argc == 1) {
-    std::cout << "Using default input file: " << filename << std::endl;
-  } else if (argc == 2) {