Revision: 112 http://trac.macosforge.org/projects/libdispatch/changeset/112 Author: robert@fledge.watson.org Date: 2009-11-03 12:28:17 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Test for Core Services, and if present, do compile dispatch_cffd regression test. Modified Paths: -------------- trunk/configure.ac trunk/testing/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-03 17:47:11 UTC (rev 111) +++ trunk/configure.ac 2009-11-03 20:28:17 UTC (rev 112) @@ -140,6 +140,16 @@ AC_CHECK_HEADERS([TargetConditionals.h pthread_machdep.h pthread_np.h malloc/malloc.h libkern/OSCrossEndian.h libkern/OSAtomic.h]) # +# Core Services is tested in one of the GCD regression tests, so test for its +# presence using its header file. +# +AC_CHECK_HEADER([CoreServices/CoreServices.h], + [have_coreservices=true], + [have_coreservices=false] +) +AM_CONDITIONAL(HAVE_CORESERVICES, $have_coreservices) + +# # We use the availability of mach.h to decide whether to compile in all sorts # of Machisms, including using Mach ports as event sources, etc. # Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 17:47:11 UTC (rev 111) +++ trunk/testing/Makefile.am 2009-11-03 20:28:17 UTC (rev 112) @@ -7,6 +7,15 @@ libtest_la_SOURCES= \ dispatch_test.c +TESTS= \ + dispatch_api \ + dispatch_c99 \ + dispatch_cascade \ + dispatch_debug \ + dispatch_priority \ + dispatch_starfish \ + queue_finalizer + if HAVE_BLOCKS BLOCKS_TESTS= \ dispatch_after \ @@ -20,24 +29,20 @@ dispatch_timer_bit31 \ dispatch_timer_bit63 endif +TESTS+=$(BLOCKS_TESTS) -TESTS= \ - dispatch_api \ - dispatch_c99 \ - dispatch_cascade \ - dispatch_debug \ - dispatch_priority \ - dispatch_starfish \ - queue_finalizer +if HAVE_CORESERVICES +CORESERVICES_TESTS= \ + dispatch_cffd +dispatch_cffd_LDFLAGS=-framework CoreFoundation +endif +TESTS+=$(CORESERVICES_TESTS) -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. # BROKEN_TESTS= \ - dispatch_cffd \ dispatch_proc \ dispatch_timer_set_time