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

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-10-10 13:46:45 -0500 (Wed, 10 Oct 2012)
New Revision: 5784

Modified:
   cgm/trunk/test/Makefile.am
   cgm/trunk/test/attribute_to_file.cpp
   cgm/trunk/test/loft.cpp
   cgm/trunk/test/makept.cpp
   cgm/trunk/test/modify.cpp
   cgm/trunk/test/operation.cpp
   cgm/trunk/test/r_w.cpp
   cgm/trunk/test/subtract.cpp
   cgm/trunk/test/test_occ.cpp
Log:
Merge the changes to merge-cubit13.1. This directory was missed until I did the make check.

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2012-10-10 18:35:45 UTC (rev 5783)
+++ cgm/trunk/test/Makefile.am	2012-10-10 18:46:45 UTC (rev 5784)
@@ -13,7 +13,7 @@
 
 TESTS = init sheet
 if build_ACIS
-  TESTS += webcut hollow_acis brick_acis merge_acis point_project_acis AngleCalc_acis CreateGeometry_acis GraphicsData_acis
+  TESTS += webcut hollow_acis brick_acis merge_acis AngleCalc_acis CreateGeometry_acis GraphicsData_acis
 else
 if WITH_CUBIT
   TESTS += webcut brick_acis merge_acis
@@ -22,13 +22,13 @@
 endif
 endif
 if build_OCC
-  TESTS += attribute_to_file  AngleCalc_occ  CreateGeometry_occ GraphicsData_occ modify subtract makept loft offset_curves r_w test_occ operation brick_occ merge_occ point_project imprint_bug section
-endif 
+  TESTS += attribute_to_file loft offset_curves point_project imprint_bug modify subtract makept test_occ brick_occ merge_occ r_w operation section AngleCalc_occ  CreateGeometry_occ GraphicsData_occ
+endif
 
 check_PROGRAMS = $(TESTS)
 
-LDADD = ../libcgm.la libcgm_test.la $(CGM_EXT_LIBS)
-AM_LDFLAGS += $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS)
+LDADD = ../libcgm.la libcgm_test.la $(CGM_EXT_LIBS) 
+AM_LDFLAGS += $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) -lcubit_geom -lcubit_util -lcubit_virtual -lcubit_facet
 
 noinst_LTLIBRARIES = libcgm_test.la
 libcgm_test_la_SOURCES = TestUtilities.hpp \
@@ -36,9 +36,6 @@
 
 webcut_SOURCES = webcut.cpp
 hollow_acis_SOURCES = hollow_acis.cpp
-point_project_acis_SOURCES = point_project_acis.cpp
-point_project_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) '-DTEST_ENGINE="ACIS"'
-
 makept_SOURCES = makept.cpp
 offset_curves_SOURCES = offset_curves.cpp
 loft_SOURCES = loft.cpp
@@ -92,9 +89,6 @@
              66_shaver3.brep \
              72_shaver6.brep \
              LeverArm.brep \
-             aftersub.occ_ref \
-             beforesub.occ_ref \
-             beforesub2.occ_ref \
              unite1.occ\
              huge.sat \
              model1.sat \