From patchwork Fri May 16 21:34:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 995 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 6FA5436001D for ; Fri, 16 May 2014 14:35:07 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14307373) id D0F535855650; Fri, 16 May 2014 14:35:06 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx22.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx22.g.dreamhost.com (Postfix) with ESMTPS id EB3815840609 for ; Fri, 16 May 2014 14:35:05 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=PdYO4LvNYY8pxlV9SMtMlMpdd5/Y3 hxE8+vG++IuUC3ZSA/6n8yGj5mKCFKKAwUoZSSn0G/laE5J1nxIlODAynVQ3BgZn HSszktqjc1eI3C+2eT0s598ykvtMuV1WkY9VPmW0rhQ/y1wCT+tWalk57MthHyBW +M6DLqHGImS700= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=gcxYaFeGkD8gnLPTUOCHIJ63Yt4=; b=uDR EcBB/ZDPwP0qNLzor1sKCtV/ZCRjNpFxxDlIts13luLuJ3Xad31VlAZsGARtfitg 6o2YT0cnc3XxuLP+5G4F2sak8kW++khY3MzxhQYL/lLDYIr2mIaZSge8kTARKTJ/ xhZM4Ch+pRFwvdHbbybwbs4JE/eO/rjPaiX5jKQE= Received: (qmail 30208 invoked by alias); 16 May 2014 21:35:03 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 30192 invoked by uid 89); 16 May 2014 21:35:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Fri, 16 May 2014 21:34:55 +0000 From: "Joseph S. Myers" To: Subject: conformtest: clean up POSIX expections for sys/utsname.h, sys/wait.h Message-ID: MIME-Version: 1.0 X-DH-Original-To: glibc@patchwork.siddhesh.in Continuing the series of patches to clean up conformtest expectations for "POSIX" (1995/6) based on review of the expectations against the standard, this patch cleans up expectations for sys/utsname.h and sys/wait.h. Tested x86_64; a new XFAIL for sys/wait.h is added. (This patch is independent of my previous patch .) 2014-05-16 Joseph Myers * conform/data/sys/utsname.h-data (*_t): Allow. * conform/data/sys/wait.h-data [POSIX] (uid_t): Do not define. [POSIX] (WEXITED): Do not expect constant. [POSIX] (WSTOPPED): Likewise. [POSIX] (WNOHANG): Likewise. [POSIX] (WNOWAIT): Likewise. [POSIX] (siginfo_t): Do not expect type or elements. [POSIX] (pid_t): Do not expect type. [POSIX] (signal.h): Do not allow header. [POSIX] (sys/resource.h): Likewise. [POSIX] (si_*): Do not allow pattern. [POSIX] (W*): Likewise. [POSIX] (P_*): Likewise. [POSIX] (BUS_*): Likewise. [POSIX] (CLD_*): Likewise. [POSIX] (FPE_*): Likewise. [POSIX] (ILL_*): Likewise. [POSIX] (POLL_*): Likewise. [POSIX] (SEGV_*): Likewise. [POSIX] (SI_*): Likewise. [POSIX] (TRAP_*): Likewise. * conform/Makefile (test-xfail-POSIX/sys/wait.h/conform): New variable. diff --git a/conform/Makefile b/conform/Makefile index e1df914..c360c33 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -189,6 +189,7 @@ test-xfail-XPG4/ucontext.h/conform = yes test-xfail-XPG4/unistd.h/conform = yes test-xfail-XPG4/utmpx.h/conform = yes test-xfail-POSIX/tar.h/conform = yes +test-xfail-POSIX/sys/wait.h/conform = yes test-xfail-UNIX98/arpa/inet.h/conform = yes test-xfail-UNIX98/fcntl.h/conform = yes test-xfail-UNIX98/langinfo.h/conform = yes diff --git a/conform/data/sys/utsname.h-data b/conform/data/sys/utsname.h-data index 3564627..82f7f39 100644 --- a/conform/data/sys/utsname.h-data +++ b/conform/data/sys/utsname.h-data @@ -8,4 +8,5 @@ element {struct utsname} char version [] element {struct utsname} char machine [] function int uname (struct utsname *) +allow *_t #endif diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data index 6acdab2..e0787e3 100644 --- a/conform/data/sys/wait.h-data +++ b/conform/data/sys/wait.h-data @@ -1,7 +1,6 @@ #if !defined ISO && !defined ISO99 && !defined ISO11 #ifdef POSIX # define pid_t __pid_t -# define uid_t __uid_t #endif constant WNOHANG @@ -17,13 +16,15 @@ macro WIFSTOPPED macro WSTOPSIG macro WTERMSIG +# ifndef POSIX constant WEXITED constant WSTOPPED -# if !defined POSIX && !defined POSIX2008 +# ifndef POSIX2008 constant WCONTINUED -# endif +# endif constant WNOHANG constant WNOWAIT +# endif #if !defined POSIX type idtype_t @@ -33,7 +34,6 @@ constant P_PID constant P_PGID type id_t -#endif type siginfo_t @@ -46,6 +46,7 @@ element siginfo_t {void*} si_addr element siginfo_t int si_status element siginfo_t long si_band element siginfo_t {union sigval} si_value +#endif #if !defined POSIX && !defined XPG3 && !defined XOPEN2K8 && !defined POSIX2008 type {struct rusage} @@ -54,7 +55,9 @@ element {struct rusage} {struct timeval} ru_utime element {struct rusage} {struct timeval} ru_stime #endif +#if !defined POSIX type pid_t +#endif function pid_t wait (int*) #if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 @@ -65,6 +68,7 @@ function int waitid (idtype_t, id_t, siginfo_t*, int) #endif function pid_t waitpid (pid_t, int*, int) +#if !defined POSIX allow-header signal.h allow-header sys/resource.h @@ -79,5 +83,6 @@ allow POLL_ allow SEGV_ allow SI_ allow TRAP_ +#endif allow *_t #endif