+2015-11-04 Joseph Myers <joseph@codesourcery.com>
+
+ * math/test-math-errno.h: New file.
+ * math/test-math-inline.h (TEST_INLINE): Define to 1 instead of
+ empty.
+ (TEST_ERRNO): New macro.
+ (TEST_EXCEPTIONS): Likewise.
+ * math/test-math-no-inline.h (TEST_INLINE): Likewise.
+ (TEST_EXCEPTIONS): Likewise.
+ * math/test-math-vector.h (TEST_ERRNO): Likewise.
+ * math/test-double.c: Include "test-math-errno.h".
+ * math/test-float.c: Likewise.
+ * math/test-ldouble.c: Likewise.
+ * math/libm-test.inc (test_single_exception) [!TEST_INLINE]: Make
+ code unconditional.
+ (test_exceptions): Only run code if TEST_EXCEPTIONS.
+ (test_single_errno) [!TEST_INLINE && !TEST_MATHVEC]: Make code
+ unconditional.
+ (test_errno): Only run code if TEST_ERRNO.
+ (enable_test): Use "if" conditional on TEST_INLINE, not #ifdef.
+
2015-11-04 Florian Weimer <fweimer@redhat.com>
* nptl/tst-once5.cc: Remove attribution.
int fe_flag,
const char *flag_name)
{
-# ifndef TEST_INLINE
int ok = 1;
if (exception & exc_flag)
{
}
if (!ok)
++noErrors;
-
-# endif
}
#endif
static void
test_exceptions (const char *test_name, int exception)
{
- if (EXCEPTION_TESTS (FLOAT))
+ if (TEST_EXCEPTIONS && EXCEPTION_TESTS (FLOAT))
{
++noExcTests;
#ifdef FE_DIVBYZERO
test_single_errno (const char *test_name, int errno_value,
int expected_value, const char *expected_name)
{
-#if !defined TEST_INLINE && !TEST_MATHVEC
if (errno_value == expected_value)
{
if (print_screen (1))
printf ("Failure: %s: errno set to %d, expected %d (%s)\n",
test_name, errno_value, expected_value, expected_name);
}
-#endif
}
/* Test whether errno (value ERRNO_VALUE) has been for TEST_NAME set
static void
test_errno (const char *test_name, int errno_value, int exceptions)
{
- ++noErrnoTests;
- if (exceptions & ERRNO_UNCHANGED)
- test_single_errno (test_name, errno_value, 0, "unchanged");
- if (exceptions & ERRNO_EDOM)
- test_single_errno (test_name, errno_value, EDOM, "EDOM");
- if (exceptions & ERRNO_ERANGE)
- test_single_errno (test_name, errno_value, ERANGE, "ERANGE");
+ if (TEST_ERRNO)
+ {
+ ++noErrnoTests;
+ if (exceptions & ERRNO_UNCHANGED)
+ test_single_errno (test_name, errno_value, 0, "unchanged");
+ if (exceptions & ERRNO_EDOM)
+ test_single_errno (test_name, errno_value, EDOM, "EDOM");
+ if (exceptions & ERRNO_ERANGE)
+ test_single_errno (test_name, errno_value, ERANGE, "ERANGE");
+ }
}
/* Returns the number of ulps that GIVEN is away from EXPECTED. */
{
if (exceptions & XFAIL_TEST)
return 0;
-#ifdef TEST_INLINE
- if (exceptions & NO_TEST_INLINE)
+ if (TEST_INLINE && (exceptions & NO_TEST_INLINE))
return 0;
-#endif
return 1;
}
#include "test-double.h"
#include "test-math-no-inline.h"
+#include "test-math-errno.h"
#include "test-math-scalar.h"
#define TEST_MSG "testing double (without inline functions)\n"
#include "test-float.h"
#include "test-math-no-inline.h"
+#include "test-math-errno.h"
#include "test-math-scalar.h"
#define TEST_MSG "testing float (without inline functions)\n"
#include "test-ldouble.h"
#include "test-math-no-inline.h"
+#include "test-math-errno.h"
#include "test-math-scalar.h"
#define TEST_MSG "testing long double (without inline functions)\n"
--- /dev/null
+/* Common definitions for libm tests for functions setting errno.
+ Copyright (C) 2015 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
+ <http://www.gnu.org/licenses/>. */
+
+#define TEST_ERRNO 1
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define TEST_INLINE
+#define TEST_INLINE 1
+#define TEST_ERRNO 0
+#define TEST_EXCEPTIONS 0
#ifdef __NO_MATH_INLINES
# undef __NO_MATH_INLINES
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#define TEST_INLINE 0
+#define TEST_EXCEPTIONS 1
+
#ifndef __NO_MATH_INLINES
# define __NO_MATH_INLINES
#endif
<http://www.gnu.org/licenses/>. */
#define TEST_MATHVEC 1
+#define TEST_ERRNO 0
#define CNCT(x, y) x ## y
#define CONCAT(a, b) CNCT (a, b)