From patchwork Thu May 22 20:10:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 351596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id A89FA1400A4 for ; Fri, 23 May 2014 06:11:15 +1000 (EST) 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=XGZ25NLjxCLSVfY7xQVpIu63T6ZO/ m0bGtGRf1MMmy4MKBaqacNZbX9Opn3jtWKeQD/pzFhThQ6w290NRl+rEPC8P6Ox0 NfBfZK2vyzr0YACJmbQI8AjLo6R+XHVRjw2X6lQ5c7coWfXwpCDVqGliZV0n07Vv c/ebOphARYSqXc= 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=3q6lR+kx/Nlo+YlibBhz33dUvrw=; b=s8Y WRDPI78WiJ+DpGKsnt3Bb94SEjepQ7rKFzrkestEaZt2ndQrhBI3fPXdxYGdipih IRAyNt3wtE+D3Z0trhFqjcy7cK9K3NH6yHYJkxhjL4JO57bh60mE4jBsEezBul4V 7n6gPQ78L5rMmEe6kACQ63+KrNtSvKwDwhUFkfqc= Received: (qmail 31118 invoked by alias); 22 May 2014 20:11:10 -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 31100 invoked by uid 89); 22 May 2014 20:11:08 -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: Thu, 22 May 2014 20:10:59 +0000 From: "Joseph S. Myers" To: Subject: conformtest: clean up POSIX expectations for termios.h, time.h Message-ID: MIME-Version: 1.0 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 termios.h and time.h. Tested x86_64; no new XFAILs needed. (This patch is independent of my previous patches and .) 2014-05-22 Joseph Myers * conform/data/termios.h-data [POSIX] (IUCLC): Do not expect constant. [POSIX] (IXANY): Likewise. [POSIX] (OLCUC): Likewise. [POSIX || POSIX2008] (CBAUD): Do not allow. [POSIX || POSIX2008] (DEFECHO): Likewise. [POSIX || POSIX2008] (ECHOCTL): Likewise. [POSIX || POSIX2008] (ECHOKE): Likewise. [POSIX || POSIX2008] (ECHOPRT): Likewise. [POSIX || POSIX2008] (EXTA): Likewise. [POSIX || POSIX2008] (EXTB): Likewise. [POSIX || POSIX2008] (FLUSHO): Likewise. [POSIX || POSIX2008] (LOBLK): Likewise. [POSIX || POSIX2008] (PENDIN): Likewise. [POSIX || POSIX2008] (SWTCH): Likewise. [POSIX || POSIX2008] (VDISCARD): Likewise. [POSIX || POSIX2008] (VDSUSP): Likewise. [POSIX || POSIX2008] (VLNEXT): Likewise. [POSIX || POSIX2008] (VREPRINT): Likewise. [POSIX || POSIX2008] (VSTATUS): Likewise. [POSIX || POSIX2008] (VWERASE): Likewise. (B*): Change to B[0123456789]*. * conform/data/time.h-data [POSIX || UNIX98] (CLOCK_PROCESS_CPUTIME_ID): Do not expect constant. [POSIX || UNIX98] (CLOCK_THREAD_CPUTIME_ID): Likewise. [POSIX || UNIX98] (CLOCK_MONOTONIC): Likewise. [POSIX] (tm_*): Do not allow. diff --git a/conform/data/termios.h-data b/conform/data/termios.h-data index 3f7ab4b..de34bf5 100644 --- a/conform/data/termios.h-data +++ b/conform/data/termios.h-data @@ -37,16 +37,18 @@ constant IGNPAR constant INLCR constant INPCK constant ISTRIP -# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 +# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 constant IUCLC # endif +# ifndef POSIX constant IXANY +# endif constant IXOFF constant IXON constant PARMRK constant OPOST -# if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 +# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 constant OLCUC # endif # if !defined POSIX && !defined POSIX2008 @@ -148,6 +150,7 @@ function pid_t tcgetsid (int) function int tcsendbreak (int, int) function int tcsetattr (int, int, const struct termios*) +#if !defined POSIX && !defined POSIX2008 allow CBAUD allow DEFECHO allow ECHOCTL @@ -165,12 +168,13 @@ allow VLNEXT allow VREPRINT allow VSTATUS allow VWERASE +#endif allow c_* allow V* allow I* allow O* allow TC* -allow B* +allow B[0123456789]* allow *_t #endif diff --git a/conform/data/time.h-data b/conform/data/time.h-data index fead998..ddd9a07 100644 --- a/conform/data/time.h-data +++ b/conform/data/time.h-data @@ -46,8 +46,10 @@ function int timespec_get (struct timespec *, int) symbol CLK_TCK # endif # if !defined XPG3 && !defined XPG4 +# if !defined POSIX && !defined UNIX98 constant CLOCK_PROCESS_CPUTIME_ID constant CLOCK_THREAD_CPUTIME_ID +# endif type {struct itimerspec} @@ -56,7 +58,9 @@ element {struct itimerspec} {struct timespec} it_value constant CLOCK_REALTIME constant TIMER_ABSTIME +# if !defined POSIX && !defined UNIX98 constant CLOCK_MONOTONIC +# endif type clockid_t type timer_t @@ -116,7 +120,9 @@ variable {long int} timezone # endif variable {char*} tzname [2] +# ifndef POSIX allow tm_* +# endif allow clock_* allow timer_* allow it_*