From patchwork Thu May 9 02:27:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 1933309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PJJxruzz; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VZbX01sdyz20fZ for ; Thu, 9 May 2024 12:27:44 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E9162384B06A for ; Thu, 9 May 2024 02:27:36 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 270BA3858D1E for ; Thu, 9 May 2024 02:27:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 270BA3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 270BA3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715221643; cv=none; b=vH4oudBCJCVUNE34Urr08/F3SpXnUMPvhcWVepe0tEmaeFPLIm3hzbFt875PVuUfy4oionIDwDYY04EtcAqEmNbCZG0GqH1UEV6U4vAIDcL8a7yhNWfzJNl1xpiDRE37kbeYesk6SIlDlyyeO0mbzNlyLwxk8BsZPhzxN43ArJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715221643; c=relaxed/simple; bh=QUXgQis/rACA86JiI1KPK5+r3rywDVygKNsvB+EdpsI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=buOvq1udWnfnvprcISm91HNOavZqK8kzxXwhNrkv20B9WkyN+ULl+ahsS3WyXYyEbWCk9Xm0pxO2RlJXcVgdMSIhCR7U6ubGGmLFO0CFM+IQfb5rLll+YqJTH+z1XpvUprdcyXBAE+lCzf/GL2I0k78T4HZkWqXkBVnjWYOrjt0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715221641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdVwvqgU2eGT3xdA7a649HD40TgAPYbTZqueGei+yVE=; b=PJJxruzzN62NOIp/LetgldRRxfNWTY8qrksNqqiJS0ezsR1TB8jaPPfZsNjryUkXXrLUi+ Imb8HURhCNRC7sA9iVRvDty25cgB0hEmcf7mWCk3zjNokA6W9JSayUbW4uT/7B/dgQLhM9 9w5T4K202h/X6Z1EyOJuLoKACRm9+1Q= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-259-REvrMWonMCmNvA4CCNxKAA-1; Wed, 08 May 2024 22:27:20 -0400 X-MC-Unique: REvrMWonMCmNvA4CCNxKAA-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-78eeb60e1fbso46479585a.1 for ; Wed, 08 May 2024 19:27:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715221639; x=1715826439; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YdVwvqgU2eGT3xdA7a649HD40TgAPYbTZqueGei+yVE=; b=rbLvUN3sD+NSsKGTOnyM0dTzWWFwYvLVgo0IM+O5LhYsdI10wh86/Q286YBF8kR7A7 mYEWAet2rusaF7nasqG4TOTrTfAUJtMqv02cwryKJGfuwrBsImot+pgK8kEWq8WnF1ng VWKbyCZ/ONwIoPUFnc1kRTzfsNLBm6N2QRKpkFKcBA+061rMM28jT92E9Po/NOdocMmk Y5IamYIWYMGX1tiSbJ9yzmX5/mmneLGKHTV517jMYIC5ALsv6+biGNPlqflSpNFVUMnA 4GYhcAyiCEp8837BofCHIf0xKgnYFyoacypR3qSpZSZl6Uoj0PSgozE3iU5SbN+24bH3 HWew== X-Gm-Message-State: AOJu0Yza4kpT3gJsdGMw5nX1xwXLBUIJfi7HpMGj5AM7ComanzbYYmCY HJMJ6Pn1CJ0TKEmoXRR1wzDw6VzfndlELxYng7MXImWytpbEtVg9CqLhL3hUy4GyJWYLeTFAEGn oj0cLzLmx46Awzz45MJJBw+ZqI27YNwiVPHHrFb3kIIluV3Mvvrvs8rHykmPX+U0haWia6mJoGr RupqRnqTjc9Z0+lC7kWs+6NDIcDtgowZa7w6wR8jpg/Q== X-Received: by 2002:ad4:5caf:0:b0:6a0:583b:8cc5 with SMTP id 6a1803df08f44-6a151461123mr52732966d6.33.1715221639205; Wed, 08 May 2024 19:27:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/0NhYjLFRz/G/7ZeShK5HXk0piCOIlG5bzsv98ZEHqC8qsbWgHmOh59huVm73pIiNjq2igA== X-Received: by 2002:ad4:5caf:0:b0:6a0:583b:8cc5 with SMTP id 6a1803df08f44-6a151461123mr52732796d6.33.1715221638850; Wed, 08 May 2024 19:27:18 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6a15f1ce896sm2051866d6.92.2024.05.08.19.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 19:27:18 -0700 (PDT) From: Joe Simmons-Talbott To: libc-alpha@sourceware.org Cc: Joe Talbott , Carlos O'Donell Subject: [PATCH v2] math: Add GLIBC_TEST_LIBM_VERBOSE environment variable support. Date: Wed, 8 May 2024 22:27:03 -0400 Message-ID: <20240509022714.558030-1-josimmon@redhat.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org From: Joe Talbott Allow the libm-test-driver based tests to have their verbosity set based on the GLIBC_TEST_LIBM_VERBOSE environment variable. This allows the entire testsuite to be run with a non-default verbosity. While here check the conversion for the verbose option as well. Reviewed-by: Carlos O'Donell --- math/libm-test-support.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/math/libm-test-support.c b/math/libm-test-support.c index 1d60ac783b..0cae545f86 100644 --- a/math/libm-test-support.c +++ b/math/libm-test-support.c @@ -130,7 +130,7 @@ static int noTests; /* number of tests (without testing exceptions) */ static int noExcTests; /* number of tests for exception flags */ static int noErrnoTests;/* number of tests for errno values */ -static int verbose; +static unsigned int verbose; static int output_max_error; /* Should the maximal errors printed? */ static int output_points; /* Should the single function results printed? */ static int ignore_max_ulp; /* Should we ignore max_ulp? */ @@ -1057,7 +1057,14 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case 'v': if (optarg) - verbose = (unsigned int) strtoul (optarg, NULL, 0); + { + char *optstr_conv = optarg; + unsigned int opt_verbose; + + opt_verbose = (unsigned int) strtoul (optarg, &optstr_conv, 0); + if (*optstr_conv == '\0' && optstr_conv != optarg) + verbose = opt_verbose; + } else verbose = 3; break; @@ -1139,6 +1146,7 @@ libm_test_init (int argc, char **argv) int remaining; char *ulps_file_path; size_t dir_len = 0; + char *envstr_verbose; verbose = 1; output_ulps = 0; @@ -1148,6 +1156,17 @@ libm_test_init (int argc, char **argv) /* XXX set to 0 for releases. */ ignore_max_ulp = 0; + envstr_verbose = getenv("GLIBC_TEST_LIBM_VERBOSE"); + if (envstr_verbose != NULL) + { + char *envstr_conv = envstr_verbose; + unsigned int env_verbose; + + env_verbose = (unsigned int) strtoul (envstr_verbose, &envstr_conv, 0); + if (*envstr_conv == '\0' && envstr_conv != envstr_verbose) + verbose = env_verbose; + } + /* Parse and process arguments. */ argp_parse (&argp, argc, argv, 0, &remaining, NULL);