[PATCH 0/1] MR8521: ucrtbase/tests: Move exp tests from msvcr120.

[PATCH 1/1] ucrtbase/tests: Move exp tests from msvcr120.

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/msvcr120/tests/msvcr120.c | 44 -----------------------
 dlls/ucrtbase/tests/misc.c     | 64 ++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 44 deletions(-)

diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c
index 462d7bd11bd..6f1eafcaf79 100644
--- a/dlls/msvcr120/tests/msvcr120.c
+++ b/dlls/msvcr120/tests/msvcr120.c
@@ -1810,49 +1810,6 @@ static int CDECL matherr_callback(struct _exception *e)
     return 0;
 }

-static void test_exp(void)
-{
-    static const struct {
-        double x, exp;
-        errno_t e;
-    } tests[] = {
-        {  NAN,               NAN,                     EDOM  },
-        { -NAN,              -NAN,                     EDOM  },
-        {  INFINITY,          INFINITY                       },
-        { -INFINITY,          0.0                            },
-        {  0.0,               1.0                            },
-        {  1.0,               2.7182818284590451             },
-        {  709.7,             1.6549840276802644e+308        },
-        {  709.782712893384,  1.7976931348622732e+308        },
-        {  709.782712893385,  INFINITY,               ERANGE },
-    };
-    errno_t e;
-    double r;
-    int i;
-
-    __setusermatherr(matherr_callback);
-
-    for(i=0; i<ARRAY_SIZE(tests); i++) {
-        errno = 0;
-        matherr_called = 0;
-        r = exp(tests[i].x);
-        e = errno;
-        if(_isnan(tests[i].exp))
-            ok(_isnan(r), "expected NAN, got %0.16e for %d\n", r, i);
-        else
-            ok(compare_double(r, tests[i].exp, 16), "expected %0.16e, got %0.16e for %d\n", tests[i].exp, r, i);
-        ok(signbit(r) == signbit(tests[i].exp), "expected sign %x, got %x for %d\n",
-            signbit(tests[i].exp), signbit(r), i);
-        ok(e == tests[i].e, "expected errno %i, but got %i for %d\n", tests[i].e, e, i);
-        if (tests[i].e)
-            ok(matherr_called, "matherr wasn't called for %d\n", i);
-        else
-            ok(!matherr_called, "matherr was called for %d\n", i);
-    }
-
-    __setusermatherr(NULL);
-}
-
 static void test_cexp(void)
 {
     static const struct {
@@ -1980,6 +1937,5 @@ START_TEST(msvcr120)
     test_strcmp();
     test_gmtime64();
     test__fsopen();
-    test_exp();
     test_cexp();
 }
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index 81220e2c54f..713c94a8b74 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -136,6 +136,23 @@ static BOOL compare_float(float f, float g, unsigned int ulps)
     return compare_uint(x, y, ulps);
 }

+static inline BOOL compare_double(double f, double g, unsigned int ulps)
+{
+    ULONGLONG x = *(ULONGLONG *)&f;
+    ULONGLONG y = *(ULONGLONG *)&g;
+
+    if (f < 0)
+        x = ~x + 1;
+    else
+        x |= ((ULONGLONG)1)<<63;
+    if (g < 0)
+        y = ~y + 1;
+    else
+        y |= ((ULONGLONG)1)<<63;
+
+    return (x>y ? x-y : y-x) <= ulps;
+}
+
 static void test__initialize_onexit_table(void)
 {
     _onexit_table_t table, table2;
@@ -1775,6 +1792,52 @@ static void test__get_heap_handle(void)
     ok((HANDLE)_get_heap_handle() == GetProcessHeap(), "Expected _get_heap_handle() to return GetProcessHeap()\n");
 }

+static void test_exp(void)
+{
+    static const struct {
+        double x, exp;
+        int type;
+        errno_t e;
+    } tests[] = {
+        {  NAN,               NAN,                     _DOMAIN,  EDOM   },
+        { -NAN,              -NAN,                     _DOMAIN,  EDOM   },
+        {  INFINITY,          INFINITY                                  },
+        { -INFINITY,          0.0                                       },
+        {  0.0,               1.0                                       },
+        {  1.0,               2.7182818284590451                        },
+        {  709.7,             1.6549840276802644e+308                   },
+        {  709.782712893384,  1.7976931348622732e+308                   },
+        {  709.782712893385,  INFINITY,               _OVERFLOW, ERANGE },
+    };
+    errno_t e;
+    double r;
+    int i;
+
+    __setusermatherr(matherr_callback);
+
+    for(i=0; i<ARRAY_SIZE(tests); i++) {
+        errno = -1;
+        exception.type = -1;
+        r = exp(tests[i].x);
+        e = errno;
+
+        if(_isnan(tests[i].exp))
+            ok(_isnan(r), "expected NAN, got %0.16e for %d\n", r, i);
+        else
+            ok(compare_double(r, tests[i].exp, 16), "expected %0.16e, got %0.16e for %d\n", tests[i].exp, r, i);
+        ok(signbit(r) == signbit(tests[i].exp), "expected sign %x, got %x for %d\n",
+            signbit(tests[i].exp), signbit(r), i);
+
+        ok(e == tests[i].e ? tests[i].e : -1,
+            "expected errno %d, but got %d for %d\n", tests[i].e, e, i);
+
+        ok(exception.type == tests[i].type ? tests[i].type : -1,
+            "expected %d, got %d for %d\n", tests[i].type, exception.type, i);
+    }
+
+    __setusermatherr(NULL);
+}
+
 static void test_expf(void)
 {
     static const struct {
@@ -1871,5 +1934,6 @@ START_TEST(misc)
 #endif
     test_gmtime64();
     test__get_heap_handle();
+    test_exp();
     test_expf();
 }

[PATCH 0/1] MR8521: ucrtbase/tests: Move exp tests from msvcr120. - approved

[Piotr Caban (＠piotr)]

This merge request was approved by Piotr Caban.