2 files changed, 189 insertions, 0 deletions

diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile
index d2a3ebffadb3..d723e0aaf656 100644
--- a/lib/msun/tests/Makefile
+++ b/lib/msun/tests/Makefile
@@ -58,6 +58,7 @@ ATF_TESTS_C+=	exponential_test
 ATF_TESTS_C+=	fenv_test
 ATF_TESTS_C+=	fma_test
 ATF_TESTS_C+=	fmaxmin_test
+ATF_TESTS_C+=	fmaximum_fminimum_test
 ATF_TESTS_C+=	ilogb2_test
 ATF_TESTS_C+=	invtrig_test
 ATF_TESTS_C+=	invctrig_test
diff --git a/lib/msun/tests/fmaximum_fminimum_test.c b/lib/msun/tests/fmaximum_fminimum_test.c
new file mode 100644
index 000000000000..4641f80dfdad
--- /dev/null
+++ b/lib/msun/tests/fmaximum_fminimum_test.c
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Tests for fmaximum{,f,l}() and fminimum{,f,l}()
+ */
+
+#include <sys/cdefs.h>
+#include <fenv.h>
+#include <float.h>
+#include <math.h>
+
+#include "test-utils.h"
+
+#pragma STDC FENV_ACCESS ON
+
+/*
+ * Test whether func(x, y) has the expected result, and make sure no
+ * exceptions are raised.
+ */
+#define	TEST(func, type, x, y, expected, rmode) do {			      \
+	type __x = (x);	/* convert before we clear exceptions */	      \
+	type __y = (y);							      \
+	ATF_REQUIRE_EQ(0, feclearexcept(ALL_STD_EXCEPT));		      \
+	long double __result = func((__x), (__y));			      \
+	CHECK_FP_EXCEPTIONS_MSG(0, ALL_STD_EXCEPT,			      \
+	    #func "(%.20Lg, %.20Lg) rmode%d", (x), (y), rmode);		      \
+	ATF_CHECK_MSG(fpequal_cs(__result, (expected), true),		      \
+	    #func "(%.20Lg, %.20Lg) rmode%d = %.20Lg, expected %.20Lg",       \
+	    (x), (y), rmode, __result, (expected));			      \
+} while (0)
+
+static void
+testall_r(long double big, long double small, int rmode)
+{
+	long double expected_max, expected_min;
+	if (isnan(big) || isnan(small)) {
+		expected_max = big + small;
+		expected_min = expected_max;
+	} else {
+		expected_max = big;
+		expected_min = small;
+	}
+
+	TEST(fmaximumf, float, big, small, expected_max, rmode);
+	TEST(fmaximumf, float, small, big, expected_max, rmode);
+	TEST(fmaximum, double, big, small, expected_max, rmode);
+	TEST(fmaximum, double, small, big, expected_max, rmode);
+	TEST(fmaximuml, long double, big, small, expected_max, rmode);
+	TEST(fmaximuml, long double, small, big, expected_max, rmode);
+	TEST(fminimumf, float, big, small, expected_min, rmode);
+	TEST(fminimumf, float, small, big, expected_min, rmode);
+	TEST(fminimum, double, big, small, expected_min, rmode);
+	TEST(fminimum, double, small, big, expected_min, rmode);
+	TEST(fminimuml, long double, big, small, expected_min, rmode);
+	TEST(fminimuml, long double, small, big, expected_min, rmode);
+}
+
+/*
+ * Test all the functions: fmaximumf, fmaximum, fmaximuml, fminimumf, fminimum, fminimuml
+ * in all rounding modes and with the arguments in different orders.
+ * The input 'big' must be >= 'small'.
+ */
+static void
+testall(long double big, long double small)
+{
+	static const int rmodes[] = {
+		FE_TONEAREST, FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO
+	};
+	int i;
+
+	for (i = 0; i < 4; i++) {
+		fesetround(rmodes[i]);
+		testall_r(big, small, rmodes[i]);
+	}
+}
+
+ATF_TC_WITHOUT_HEAD(test1);
+ATF_TC_BODY(test1, tc)
+{
+	testall(1.0, 0.0);
+}
+
+ATF_TC_WITHOUT_HEAD(test2);
+ATF_TC_BODY(test2, tc)
+{
+	testall(42.0, nextafterf(42.0, -INFINITY));
+}
+ATF_TC_WITHOUT_HEAD(test3);
+ATF_TC_BODY(test3, tc)
+{
+	testall(nextafterf(42.0, INFINITY), 42.0);
+}
+
+ATF_TC_WITHOUT_HEAD(test4);
+ATF_TC_BODY(test4, tc)
+{
+	testall(-5.0, -5.0);
+}
+
+ATF_TC_WITHOUT_HEAD(test5);
+ATF_TC_BODY(test5, tc)
+{
+	testall(-3.0, -4.0);
+}
+
+ATF_TC_WITHOUT_HEAD(test6);
+ATF_TC_BODY(test6, tc)
+{
+	testall(1.0, NAN);
+}
+ATF_TC_WITHOUT_HEAD(test7);
+ATF_TC_BODY(test7, tc)
+{
+	testall(INFINITY, NAN);
+}
+
+ATF_TC_WITHOUT_HEAD(test8);
+ATF_TC_BODY(test8, tc)
+{
+	testall(INFINITY, 1.0);
+}
+
+ATF_TC_WITHOUT_HEAD(test9);
+ATF_TC_BODY(test9, tc)
+{
+	testall(-3.0, -INFINITY);
+}
+
+ATF_TC_WITHOUT_HEAD(test10);
+ATF_TC_BODY(test10, tc)
+{
+	testall(3.0, -INFINITY);
+}
+
+ATF_TC_WITHOUT_HEAD(test11);
+ATF_TC_BODY(test11, tc)
+{
+	testall(NAN, NAN);
+}
+
+ATF_TC_WITHOUT_HEAD(test12);
+ATF_TC_BODY(test12, tc)
+{
+	testall(0.0, -0.0);
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, test1);
+	ATF_TP_ADD_TC(tp, test2);
+	ATF_TP_ADD_TC(tp, test3);
+	ATF_TP_ADD_TC(tp, test4);
+	ATF_TP_ADD_TC(tp, test5);
+	ATF_TP_ADD_TC(tp, test6);
+	ATF_TP_ADD_TC(tp, test7);
+	ATF_TP_ADD_TC(tp, test8);
+	ATF_TP_ADD_TC(tp, test9);
+	ATF_TP_ADD_TC(tp, test10);
+	ATF_TP_ADD_TC(tp, test11);
+	ATF_TP_ADD_TC(tp, test12);
+
+	return (atf_no_error());
+}