From patchwork Tue Jun 10 14:00:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco X-Patchwork-Id: 357946 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 1736E140079 for ; Wed, 11 Jun 2014 00:01:02 +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:from:to:cc:subject:date:message-id :mime-version:content-type; q=dns; s=default; b=dQAqxAirk8CZFrBI QFX20mJcf0bJny4u3HuGaJDy8GaK0k7ztOJvGE1jqwZA4aIHaam0p6HVGc9TlTfJ SMBY0RIy2/LzAma2bLs5mgYYc1/ggDkhuqCOwFCBD3HiIA07cqmkwp1018ihH6Tx 0TMy2iZLtQwndhKafnMhygpWr7A= 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:from:to:cc:subject:date:message-id :mime-version:content-type; s=default; bh=CZsIs8Qtz4uXWaOv3bdSPV WPmlQ=; b=BuSTE6ZSD7sXcEdEUWjCX5Sx/lJpnFbMezvW9imVq5f7UbL8J+Kj0I 5I71VNoOsAEdqc033hkDIt2KOHuOLlWINDASt0bb9lhx5HLesMr5KeumggL6IqdW wREd81PTrBNVo5Tq2Q34SbcSx2cUOSsxlahf/zqjDYAbK4x9xaYB8= Received: (qmail 7902 invoked by alias); 10 Jun 2014 14:00:57 -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 7891 invoked by uid 89); 10 Jun 2014 14:00:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, LIKELY_SPAM_SUBJECT, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: service87.mimecast.com From: "Wilco" To: "'Joseph Myers'" , "'Marcus Shawcroft'" Cc: Subject: FW: [PATCH] Add FE_NOMASK_ENV return value test Date: Tue, 10 Jun 2014 15:00:42 +0100 Message-ID: <002901cf84b4$5ea6c080$1bf44180$@com> MIME-Version: 1.0 X-MC-Unique: 114061015005201001 Joseph wrote: > On Tue, 3 Jun 2014, Wilco wrote: > > > Yes, the test was too strict for trapping implementations, I've updated it. > > This version is OK with the comment at the top of the test fixed to say > what it actually tests, rather than being copied from a test for a > different bug. I've changed the comment at top to say: "Test return value when setting FE_NOMASK_ENV (BZ16918, BZ17009)." Marcus, can you check this in? Wilco ChangeLog: 2014-06-10 Wilco * math/test-fenv-return.c: New file. Test FE_NOMASK_ENV return values. * math/Makefile: Add new test test-fenv-return. --- math/Makefile | 2 +- math/test-fenv-return.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 math/test-fenv-return.c diff --git a/math/Makefile b/math/Makefile index f337a0e..cd59ce5 100644 --- a/math/Makefile +++ b/math/Makefile @@ -90,7 +90,7 @@ tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \ test-misc test-fpucw test-fpucw-ieee tst-definitions test-tgmath \ test-tgmath-ret bug-nextafter bug-nexttoward bug-tgmath1 \ test-tgmath-int test-tgmath2 test-powl tst-CMPLX tst-CMPLX2 test-snan \ - test-fenv-tls test-fenv-preserve $(tests-static) + test-fenv-tls test-fenv-preserve test-fenv-return $(tests-static) tests-static = test-fpucw-static test-fpucw-ieee-static # We do the `long double' tests only if this data type is available and # distinct from `double'. diff --git a/math/test-fenv-return.c b/math/test-fenv-return.c new file mode 100644 index 0000000..f94a95c --- /dev/null +++ b/math/test-fenv-return.c @@ -0,0 +1,123 @@ +/* Test return value when setting FE_NOMASK_ENV (BZ16918, BZ17009). + Copyright (C) 2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +static int count_errors; + +static void +test_feenableexcept (void) +{ +#if defined FE_ALL_EXCEPT + int res; + + fedisableexcept (FE_ALL_EXCEPT); + + res = feenableexcept (FE_ALL_EXCEPT); + + if (!EXCEPTION_ENABLE_SUPPORTED (FE_ALL_EXCEPT) && (res == -1)) + { + puts ("feenableexcept (FE_ALL_EXCEPT) not supported, cannot test."); + return; + } + else if (res != 0) + { + puts ("feenableexcept (FE_ALL_EXCEPT) failed"); + count_errors++; + } + + if (fegetexcept () != FE_ALL_EXCEPT) + { + puts ("feenableexcept did not set all exceptions"); + count_errors++; + } +#endif +} + +static void +test_fesetenv (void) +{ +#if defined FE_NOMASK_ENV && defined FE_ALL_EXCEPT + int res; + + fedisableexcept (FE_ALL_EXCEPT); + + res = fesetenv (FE_NOMASK_ENV); + + if (!EXCEPTION_ENABLE_SUPPORTED (FE_ALL_EXCEPT) && (res != 0)) + { + puts ("fesetenv (FE_NOMASK_ENV) not supported, cannot test."); + return; + } + else if (res != 0) + { + puts ("fesetenv (FE_NOMASK_ENV) failed"); + count_errors++; + } + + if (fegetexcept () != FE_ALL_EXCEPT) + { + puts ("fesetenv did not set all exceptions"); + count_errors++; + } +#endif +} + +static void +test_feupdateenv (void) +{ +#if defined FE_NOMASK_ENV && defined FE_ALL_EXCEPT + int res; + + fedisableexcept (FE_ALL_EXCEPT); + + res = feupdateenv (FE_NOMASK_ENV); + + if (!EXCEPTION_ENABLE_SUPPORTED (FE_ALL_EXCEPT) && (res != 0)) + { + puts ("feupdateenv (FE_NOMASK_ENV)) not supported, cannot test."); + return; + } + else if (res != 0) + { + puts ("feupdateenv (FE_NOMASK_ENV) failed"); + count_errors++; + } + + if (fegetexcept () != FE_ALL_EXCEPT) + { + puts ("feupdateenv did not set all exceptions"); + count_errors++; + } +#endif +} + +static int +do_test (void) +{ + test_feenableexcept (); + test_fesetenv (); + test_feupdateenv (); + + return count_errors != 0 ? 1 : 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c"