From patchwork Mon May 23 15:26:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 625273 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 3rD2Sv2JBVz9sp7 for ; Tue, 24 May 2016 01:26:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=Ep6FQp61; dkim-atps=neutral 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=XcRsCq7+5VjQheKje6Z1CaQ5lwIBz G1nBwaegbZ1aT3/Wbgy+LPc6gjkWw7iA3qSw1Zh/Z74zMyzMT/V+rcoaA86ORXPa 3y0Tl4OBQxC388YtRsEEAttV1R899OhtEK0bjZ/6zD8qqXrafkYQZSMBudxlM/fY qPNABQRZXZhz4w= 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=XeuSgMyrPsARnAr35guJOnL6eHY=; b=Ep6 FQp61vqrtDz2Q0bKdcBADZ6XVRA/XfOaxzoC1s8fjtQhpu1JOi9CMLdIolOLWPJf oCkkJ+fGvzNOpxR32tCQLU6fsvIALeC/1Y3EQ/3FNBPP+h1bHlagMcFxJIL7rH/c xTCClWOki7leA54oSLNpGMlfRjQ2QPnAJtbFYqSs= Received: (qmail 92705 invoked by alias); 23 May 2016 15:26:32 -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 92144 invoked by uid 89); 23 May 2016 15:26:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.6 required=5.0 tests=AWL, BAYES_50, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=1887, sk:CHARCLA, inet.h, limitsh X-HELO: relay1.mentorg.com Date: Mon, 23 May 2016 15:26:16 +0000 From: Joseph Myers To: Subject: conformtest: Correct some limits.h expectations for XPG3, XPG4 [committed] Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 The conform/ test of limits.h namespace for XPG3 was failing because of NL_* and NZERO defines. Those symbols are EX-shaded, not UX-shaded, so it's correct for them to be defined for XPG3; this patch corrects the expectations accordingly. (Actually it looks like they should not be listed as optional for these standards, but that's another matter.) Tested for x86_64 and x86. Committed. 2016-05-23 Joseph Myers * conform/data/limits.h-data (CHARCLASS_NAME_MAX): Also expect for [XPG3 || XPG4]. (NL_ARGMAX): Also expect for [XPG3]. (NL_LANGMAX): Likewise. (NL_MSGMAX): Likewise. (NL_NMAX): Likewise. (NL_SETMAX): Likewise. (NL_TEXTMAX): Likewise. (NZERO): Likewise. (TMP_MAX): Likewise. * conform/Makefile (test-xfail-XPG3/limits.h/conform): Remove variable. diff --git a/conform/Makefile b/conform/Makefile index b67e8e9..32a0937 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -163,7 +163,6 @@ test-xfail-XOPEN2K/ndbm.h/conform = yes test-xfail-XOPEN2K8/ndbm.h/conform = yes # Unsorted expected failures. -test-xfail-XPG3/limits.h/conform = yes test-xfail-XPG3/signal.h/conform = yes test-xfail-XPG3/sys/wait.h/conform = yes test-xfail-XPG4/arpa/inet.h/conform = yes diff --git a/conform/data/limits.h-data b/conform/data/limits.h-data index 726db1e..5ea68ff 100644 --- a/conform/data/limits.h-data +++ b/conform/data/limits.h-data @@ -170,10 +170,10 @@ constant LONG_BIT >= 32 #endif constant SSIZE_MAX -#if !defined POSIX && !defined XPG3 && !defined XPG4 +#if !defined POSIX optional-constant CHARCLASS_NAME_MAX >= 14 #endif -#if !defined POSIX && !defined XPG3 +#if !defined POSIX optional-constant NL_ARGMAX >= 9 # if !defined POSIX2008 optional-constant NL_LANGMAX >= 14 @@ -188,7 +188,7 @@ optional-constant NL_TEXTMAX optional-constant NZERO >= 20 # endif #endif -#if defined XPG4 || defined UNIX98 +#if defined XPG3 || defined XPG4 || defined UNIX98 optional-constant TMP_MAX >= 10000 #endif