From de407f79a20659fd11cc3b4e30ff9f1e349b5b93 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 17 May 2013 19:01:27 +0000
Subject: [PATCH] Don't handle ulps for integer tests in libm-test.inc.

---
 ChangeLog          |  5 +++++
 math/libm-test.inc | 18 +++---------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6bf5860..36e0da5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-05-17  Joseph Myers  <joseph@codesourcery.com>
 
+	* math/libm-test.inc (check_int): Expect result to be exactly
+	equal to expected value and do not handle ulps.
+	(check_long): Likewise.
+	(check_longlong): Likewise.
+
 	* math/libm-test.inc (ceil_test_data): Test for "inexact"
 	exceptions.
 	(cimag_test_data): Likewise.
diff --git a/math/libm-test.inc b/math/libm-test.inc
index f5fabd3..1d478ed 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -734,19 +734,15 @@ static void
 check_int (const char *test_name, int computed, int expected, int max_ulp,
 	   int exceptions)
 {
-  int diff = computed - expected;
   int ok = 0;
   int errno_value = errno;
 
   test_exceptions (test_name, exceptions);
   test_errno (test_name, errno_value, exceptions);
   noTests++;
-  if (abs (diff) <= max_ulp)
+  if (computed == expected)
     ok = 1;
 
-  if (!ok)
-    print_ulps (test_name, diff);
-
   if (print_screen (ok))
     {
       if (!ok)
@@ -768,19 +764,15 @@ static void
 check_long (const char *test_name, long int computed, long int expected,
 	    long int max_ulp, int exceptions)
 {
-  long int diff = computed - expected;
   int ok = 0;
   int errno_value = errno;
 
   test_exceptions (test_name, exceptions);
   test_errno (test_name, errno_value, exceptions);
   noTests++;
-  if (labs (diff) <= max_ulp)
+  if (computed == expected)
     ok = 1;
 
-  if (!ok)
-    print_ulps (test_name, diff);
-
   if (print_screen (ok))
     {
       if (!ok)
@@ -834,19 +826,15 @@ check_longlong (const char *test_name, long long int computed,
 		long long int max_ulp,
 		int exceptions)
 {
-  long long int diff = computed - expected;
   int ok = 0;
   int errno_value = errno;
 
   test_exceptions (test_name, exceptions);
   test_errno (test_name, errno_value, exceptions);
   noTests++;
-  if (llabs (diff) <= max_ulp)
+  if (computed == expected)
     ok = 1;
 
-  if (!ok)
-    print_ulps (test_name, diff);
-
   if (print_screen (ok))
     {
       if (!ok)
-- 
2.7.4