[cig-commits] r18356 - short/3D/PyLith/trunk

[brad at geodynamics.org]

Author: brad
Date: 2011-05-12 16:03:32 -0700 (Thu, 12 May 2011)
New Revision: 18356

Modified:
   short/3D/PyLith/trunk/Makefile.am
   short/3D/PyLith/trunk/configure.ac
Log:
Disable full-scale testing as part of 'make check' on cygwin, because libraries have not been rebased and generate errors.

Modified: short/3D/PyLith/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/Makefile.am	2011-05-12 23:03:19 UTC (rev 18355)
+++ short/3D/PyLith/trunk/Makefile.am	2011-05-12 23:03:32 UTC (rev 18356)
@@ -28,7 +28,11 @@
 
 if ENABLE_TESTING
   SUBDIRS += \
-	unittests \
+	unittests 
+endif
+
+if ENABLE_FULL_TESTING
+  SUBDIRS += \
 	tests_auto
 endif
 

Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2011-05-12 23:03:19 UTC (rev 18355)
+++ short/3D/PyLith/trunk/configure.ac	2011-05-12 23:03:32 UTC (rev 18356)
@@ -43,6 +43,15 @@
 	[if test "$enableval" = yes ; then enable_testing=yes; else enable_testing=no; fi],
 	[enable_testing=no])
 AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_testing" = yes])
+# Enable full-scale testing except on cygwin (need to rebase)
+if test "$enable_testing" = yes ; then
+  enable_full_testing=yes
+  case $host_os in
+    cygwin*)
+      enable_full_testing=no ;;
+  esac
+fi
+AM_CONDITIONAL([ENABLE_FULL_TESTING], [test "$enable_full_testing" = yes])
 
 # CUBIT I/O w/netcdf
 AC_ARG_ENABLE([cubit],