[cgma-dev] r6041 - in cgm/trunk: . test

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-05-01 12:10:13 -0500 (Wed, 01 May 2013)
New Revision: 6041

Modified:
   cgm/trunk/configure.ac
   cgm/trunk/test/Makefile.am
Log:
Changed configure.ac and test directory's Makefile.am, to add --enable-dev as an optional feature, to disable make check testing makept and modify cases for non-development activities, for a quick pre-install check and nightly check; when given --enable-dev, make check will check modify and makept for occ build.
> Passed occ static build with and w/o --enable-dev and double checked cubit build won't be affected.

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2013-04-12 06:50:48 UTC (rev 6040)
+++ cgm/trunk/configure.ac	2013-05-01 17:10:13 UTC (rev 6041)
@@ -367,6 +367,12 @@
               DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-occ=\"${withval}\""],
              [occ_DIR=no] )
 
+AC_ARG_ENABLE( dev, 
+             [AC_HELP_STRING([--enable-dev],[enable Make Check to check for modify and makept testcases in occ build, default: no])],
+             [DEV=yes], [DEV=no] )
+
+AM_CONDITIONAL(DEV, test x"$DEV" = x"yes")
+
 # if user specified option (other than --without-occ)
 CUBIT_OCC_LIB=
 HAVE_OCC_DEF=

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2013-04-12 06:50:48 UTC (rev 6040)
+++ cgm/trunk/test/Makefile.am	2013-05-01 17:10:13 UTC (rev 6041)
@@ -18,15 +18,21 @@
 if WITH_CUBIT
   TESTS += webcut merge_acis brick_acis
 else
-  TESTS += brick_facet merge_facet
+if DEV
+  TESTS += modify makept 
 endif
 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 += attribute_to_file loft offset_curves point_project imprint_bug subtract test_occ brick_occ merge_occ r_w operation section AngleCalc_occ  CreateGeometry_occ GraphicsData_occ brick_facet merge_facet
 endif
-
 check_PROGRAMS = $(TESTS)
 
+if build_OCC
+  check_PROGRAMS += modify makept
+endif
+
 noinst_LTLIBRARIES = libcgm_test.la
 
 if BUILD_CGM