X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fnexttowardl.c;h=ac0115a8d48ba8072070d4749963855f6b3da71b;hb=4f18b8f0b3cf4a59aea5258adcdd32ba2a0b6741;hp=19525ddbaf83d55c3fa147d0e1c59adc5f34b9c0;hpb=457b0dbfc1d72080f6ba9fe47cd712e0f090732a;p=libc-test

diff --git a/src/math/nexttowardl.c b/src/math/nexttowardl.c
index 19525dd..ac0115a 100644
--- a/src/math/nexttowardl.c
+++ b/src/math/nexttowardl.c
@@ -1,17 +1,22 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
+#include "sanity/nexttoward.h"
+#include "special/nexttoward.h"
 
 #elif LDBL_MANT_DIG == 64
+#include "sanity/nexttowardl.h"
+#include "special/nexttowardl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -19,17 +24,22 @@ int main(void)
 
 	for (i = 0; i < sizeof t/sizeof *t; i++) {
 		p = t + i;
-		setupfenv(p->r);
+
+		if (p->r < 0)
+			continue;
+		fesetround(p->r);
+		feclearexcept(FE_ALL_EXCEPT);
 		y = nexttowardl(p->x, p->x2);
-		e = getexcept();
-		if (!checkexcept(e, p->e, p->r)) {
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
+		if (!checkexceptall(e, p->e, p->r)) {
 			printf("%s:%d: bad fp exception: %s nexttowardl(%La,%La)=%La, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, estr(p->e));
 			printf(" got %s\n", estr(e));
 			err++;
 		}
 		d = ulperrl(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
+		if (!checkcr(y, p->y, p->r)) {
 			printf("%s:%d: %s nexttowardl(%La,%La) want %La got %La ulperr %.3f = %a + %a\n",
 				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, y, d, d-p->dy, p->dy);
 			err++;