Revision

106

Author

robert@fledge.watson.org

Date

2009-11-03 07:35:44 -0800 (Tue, 03 Nov 2009)

Log Message

Only build blocks-based tests when we have a blocks-aware compiler.

Modified Paths

• trunk/m4/blocks.m4
• trunk/testing/Makefile.am

Diff

--- trunk/m4/blocks.m4	2009-11-03 15:07:39 UTC (rev 105)
+++ trunk/m4/blocks.m4	2009-11-03 15:35:44 UTC (rev 106)
@@ -54,8 +54,11 @@
       ])
     ])
     CFLAGS="$saveCFLAGS"
+    have_cblocks=true
 ], [
     CBLOCKS_FLAGS=""
+    have_cblocks=false
 ])
+AM_CONDITIONAL(HAVE_BLOCKS, $have_cblocks)
 AC_SUBST([CBLOCKS_FLAGS])
 ])

--- trunk/testing/Makefile.am	2009-11-03 15:07:39 UTC (rev 105)
+++ trunk/testing/Makefile.am	2009-11-03 15:35:44 UTC (rev 106)
@@ -7,21 +7,27 @@
 libtest_la_SOURCES=			\
 	dispatch_test.c
 
+if HAVE_BLOCKS
+BLOCKS_TESTS=				\
+	dispatch_after			\
+	dispatch_group			\
+	dispatch_pingpong		\
+	dispatch_read			\
+	dispatch_sema			\
+	dispatch_timer_bit31		\
+	dispatch_timer_bit63
+endif
+
 TESTS=					\
-	dispatch_after			\
 	dispatch_api			\
 	dispatch_c99			\
 	dispatch_cascade		\
 	dispatch_debug			\
-	dispatch_group			\
-	dispatch_pingpong		\
 	dispatch_priority		\
-	dispatch_read			\
-	dispatch_sema			\
-	dispatch_timer_bit31		\
-	dispatch_timer_bit63		\
 	queue_finalizer
 
+TESTS+=$(BLOCKS_TESTS)
+
 #
 # XXX: By broken, we mean non-portable.  We should instead test for the OS
 # features they depend on, or port them as required.