|
From: <sv...@va...> - 2009-01-19 06:07:30
|
Author: njn
Date: 2009-01-19 06:07:23 +0000 (Mon, 19 Jan 2009)
New Revision: 8981
Log:
Disable pending on Darwin via the Makefile.am, rather than conditional
compilation.
Filter "libSystem" on Darwin, which appears to be equivalent to "libc".
Modified:
branches/DARWIN/none/tests/Makefile.am
branches/DARWIN/none/tests/pending.c
branches/DARWIN/tests/filter_libc
Modified: branches/DARWIN/none/tests/Makefile.am
===================================================================
--- branches/DARWIN/none/tests/Makefile.am 2009-01-19 05:43:38 UTC (rev 8980)
+++ branches/DARWIN/none/tests/Makefile.am 2009-01-19 06:07:23 UTC (rev 8981)
@@ -146,7 +146,6 @@
floored fork fucomip manythreads \
munmap_exe map_unaligned map_unmap mq mremap mremap2 \
nestedfns \
- pending \
pth_atfork1 pth_blockedsig pth_cancel1 pth_cancel2 pth_cvsimple \
pth_empty pth_exit pth_exit2 pth_mutexspeed pth_once pth_rwlock \
pth_stackalign \
@@ -159,11 +158,12 @@
coolo_sigaction gxx304
# DDD: not sure if these ones should work on Darwin or not... if not, should
-# be moved into linux/.
+# be moved into linux/. ('pending' probably should, it uses signals.)
if ! VGO_DARWIN
check_PROGRAMS += \
async-sigs \
- fdleak_ipv4
+ fdleak_ipv4 \
+ pending
endif
AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
Modified: branches/DARWIN/none/tests/pending.c
===================================================================
--- branches/DARWIN/none/tests/pending.c 2009-01-19 05:43:38 UTC (rev 8980)
+++ branches/DARWIN/none/tests/pending.c 2009-01-19 06:07:23 UTC (rev 8981)
@@ -11,7 +11,6 @@
#include <unistd.h>
#include <stdlib.h>
-#if !defined(__APPLE__)
static volatile int gotsig = 0;
static volatile int early = 1;
@@ -83,12 +82,3 @@
printf("OK\n");
return 0;
}
-
-#else
-
-int main(int argc, char **argv)
-{
- return 0;
-}
-
-#endif
Modified: branches/DARWIN/tests/filter_libc
===================================================================
--- branches/DARWIN/tests/filter_libc 2009-01-19 05:43:38 UTC (rev 8980)
+++ branches/DARWIN/tests/filter_libc 2009-01-19 06:07:23 UTC (rev 8981)
@@ -15,8 +15,9 @@
s/ __GI___/ __/;
s/ __([a-z]*)_nocancel / $1 /;
- s/\(in \/.*libc.*\)$/(in \/...libc...)/;
- s/\(within \/.*libc.*\)$/(within \/...libc...)/;
+ # "libSystem*" occurs on Darwin.
+ s/\(in \/.*(libc|libSystem).*\)$/(in \/...libc...)/;
+ s/\(within \/.*(libc|libSystem).*\)$/(within \/...libc...)/;
s/\(below main\) \(.+\.[cS]:\d+\)$/(below main) (in \/...libc...)/;
|