Merge pull request swiftlang#19 from dgrove-oss/tests-libbsd-fliags

Enable libbsd for test compilation and cleanup misc. warnings

Author: MadCoder

tests/Makefile.am

@@ -101,17 +101,17 @@ ORIGINAL_LIST_OF_TESTS=				\
 
 TESTS=$(PORTED_TESTS_PASSED) $(PORTED_TESTS_FAILED)
 
-dispatch_c99_CFLAGS=$(AM_CFLAGS) -std=c99
+dispatch_c99_CFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS) $(KQUEUE_CFLAGS) -std=c99
 dispatch_plusplus_SOURCES=dispatch_plusplus.cpp
 dispatch_priority2_SOURCES=dispatch_priority.c
 dispatch_priority2_CPPFLAGS=$(AM_CPPFLAGS) -DUSE_SET_TARGET_QUEUE=1
 
 AM_CPPFLAGS=-I$(top_builddir) -I$(top_srcdir)
 
 DISPATCH_TESTS_CFLAGS=-Wall -Wno-deprecated-declarations $(MARCH_FLAGS)
-AM_CFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS) $(KQUEUE_CFLAGS)
+AM_CFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS) $(KQUEUE_CFLAGS) $(BSD_OVERLAY_CFLAGS)
 AM_OBJCFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CBLOCKS_FLAGS)
-AM_CXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS)
+AM_CXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS) $(BSD_OVERLAY_CFLAGS)
 AM_OBJCXXFLAGS=$(DISPATCH_TESTS_CFLAGS) $(CXXBLOCKS_FLAGS)
 
 if HAVE_PTHREAD_WORKQUEUES
@@ -121,7 +121,7 @@ endif
 LDADD=libbsdtests.la ../src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
 libbsdtests_la_LDFLAGS=-avoid-version
 
-bsdtestsummarize_LDADD=-lm
+bsdtestsummarize_LDADD=-lm $(BSD_OVERLAY_LIBS)
 dispatch_timer_short_LDADD=-lm $(LDADD)
 dispatch_group_LDADD=-lm $(LDADD)
 

tests/bsdtests.h

@@ -29,10 +29,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
-#ifdef __linux__
-#define __printflike(a,b) __attribute__((format(printf, a, b)))
-#include <inttypes.h>
-#endif
+#include <string.h>
 
 static inline const char*
 __BASENAME__(const char *_str_)

tests/bsdtestsummarize.c

@@ -24,20 +24,6 @@
 #include <string.h>
 #include <sys/param.h>
 
-#ifndef __APPLE__
-static char*
-fgetln(FILE *stream, size_t *len)
-{
-	static char buf[1024];
-	char *cp = fgets(buf,1024,stream);
-	if (cp)
-		*len = strlen(cp);
-	else
-		*len = 0;
-	return cp;
-}
-#endif
-
 int
 has_prefix(const char* str, const char* prefix)
 {

tests/dispatch_c99.c

@@ -21,6 +21,14 @@
 #include <dispatch/dispatch.h>
 #include <stdlib.h>
 
+#ifdef __linux__
+// On Linux normally comes from libbsd overlay files,
+// but the headers are not c99 compliant so we compile
+// this test case without $(BSD_OVERLAY_CFLAGS)
+#define __printflike(a,b) __attribute__((format(printf, a, b)))
+#include <inttypes.h>
+#endif
+
 #include <bsdtests.h>
 #include "dispatch_test.h"