Author: janehu Date: 2012-11-05 12:58:41 -0600 (Mon, 05 Nov 2012) New Revision: 5852 Modified: cgm/trunk/test/Makefile.am Log: Fixed the build problem on occ-cubit, cubit13.1 has heavy memory lost problem, causes 3 of the 5 testcases fail with 'glibc detected *** corrupted double-linked list' errors, valgrind shows leaks are from /cubit/cubit13.1/bin/libSpaACIS.so. Commented out 3 testcases for ACIS and CUBIT build for this version of cgm. Passed make check in this directory. Modified: cgm/trunk/test/Makefile.am =================================================================== --- cgm/trunk/test/Makefile.am 2012-11-02 17:40:36 UTC (rev 5851) +++ cgm/trunk/test/Makefile.am 2012-11-05 18:58:41 UTC (rev 5852) @@ -11,23 +11,27 @@ -I$(srcdir) \ $(OCC_INC_FLAG) -TESTS = init sheet +TESTS = if build_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 + TESTS += webcut merge_acis else - TESTS += brick_facet merge_facet + TESTS += brick_facet merge_facet init sheet endif endif if build_OCC - 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 + TESTS += init sheet 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 ../geom/libcubit_geom.la ../util/libcubit_util.la libcgm_test.la ../geom/virtual/libcubit_virtual.la ../geom/facet/libcubit_facet.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) +if BUILD_CGM + LDADD = ../libcgm.la ../geom/libcubit_geom.la ../init/libcgma_init.la ../util/libcubit_util.la libcgm_test.la ../geom/virtual/libcubit_virtual.la ../geom/facet/libcubit_facet.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) +else + LDADD = -lcubit_geom -lcubit_util -lcubiti19 $(top_builddir)/init/libcgma_init.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) +endif noinst_LTLIBRARIES = libcgm_test.la libcgm_test_la_SOURCES = TestUtilities.hpp \