[cgma-dev] r6013 - cgm/trunk/test

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-02-19 13:41:19 -0600 (Tue, 19 Feb 2013)
New Revision: 6013

Modified:
   cgm/trunk/test/makept.cpp
   cgm/trunk/test/modify.cpp
   cgm/trunk/test/operation.cpp
   cgm/trunk/test/point_project.cpp
   cgm/trunk/test/point_project_acis.cpp
   cgm/trunk/test/r_w.cpp
Log:
Change only the modify.cpp file to set local variable to default, although other files are running ok with r6012 change, the awkawd way is not efficient, changed back to original.

Modified: cgm/trunk/test/makept.cpp
===================================================================
--- cgm/trunk/test/makept.cpp	2013-02-19 19:01:26 UTC (rev 6012)
+++ cgm/trunk/test/makept.cpp	2013-02-19 19:41:19 UTC (rev 6013)
@@ -253,15 +253,15 @@
      gti->delete_RefEntity( free_entities.get_and_step());
   }
   // Read in the geometry from files specified on the command line
-  const char *argv = STRINGIFY(SRCDIR) "/66_shaver3.brep";
+  const char *argv = "66_shaver3.brep";
   CubitStatus status = read_geometry(1, &argv);
   if (status == CUBIT_FAILURE) exit(1);
 
-  const char *argv2 = STRINGIFY(SRCDIR) "/62_shaver1.brep";
+  const char *argv2 = "62_shaver1.brep";
   status = read_geometry(1, &argv2);
   if (status == CUBIT_FAILURE) exit(1);
 
-  const char *argv3 = STRINGIFY(SRCDIR) "/72_shaver6.brep";
+  const char *argv3 = "72_shaver6.brep";
   status = read_geometry(1, &argv3);
   if (status == CUBIT_FAILURE) exit(1);
    

Modified: cgm/trunk/test/modify.cpp
===================================================================
--- cgm/trunk/test/modify.cpp	2013-02-19 19:01:26 UTC (rev 6012)
+++ cgm/trunk/test/modify.cpp	2013-02-19 19:41:19 UTC (rev 6013)
@@ -1279,10 +1279,10 @@
   //So far created volume 80.
 
   // Read in the geometry from files specified on the command line
-  argv = STRINGIFY(SRCDIR) "/Cylinder_1.brep";
-  status = read_geometry(1, &argv, true);
-  argv = STRINGIFY(SRCDIR) "/Cylinder_2.brep";
-  status = read_geometry(1, &argv, true);
+  argv = "Cylinder_1.brep";
+  status = read_geometry(1, &argv);
+  argv = "Cylinder_2.brep";
+  status = read_geometry(1, &argv);
   if (status == CUBIT_FAILURE) exit(1);
   //Read in 2 volumes.
 
@@ -1313,7 +1313,7 @@
     gti->delete_RefEntity(free_entities.get_and_step());
 
   // Read in the geometry from files specified on the command line
-  argv = STRINGIFY(SRCDIR) "/webcut.brep";
+  argv = "webcut.brep";
   read_geometry(1, &argv, false);