Module Name: src
Committed By: jruoho
Date: Mon Sep 12 16:48:48 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/lib/libm: Makefile t_ceil.c
Removed Files:
src/tests/lib/libm: t_floor.c
Log Message:
Merge 't_floor' to 't_ceil', and simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libm/t_ceil.c
cvs rdiff -u -r1.8 -r0 src/tests/lib/libm/t_floor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.383 src/distrib/sets/lists/tests/mi:1.384
--- src/distrib/sets/lists/tests/mi:1.383 Mon Sep 12 15:27:40 2011
+++ src/distrib/sets/lists/tests/mi Mon Sep 12 16:48:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.383 2011/09/12 15:27:40 jruoho Exp $
+# $NetBSD: mi,v 1.384 2011/09/12 16:48:48 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -547,7 +547,7 @@
./usr/libdata/debug/usr/tests/lib/libevent/h_event.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libm tests-lib-debug
./usr/libdata/debug/usr/tests/lib/libm/t_ceil.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/libm/t_floor.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libm/t_floor.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libm/t_infinity.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libm/t_ldexp.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libm/t_log.debug tests-lib-debug debug,atf
@@ -2253,7 +2253,7 @@
./usr/tests/lib/libm tests-lib-tests atf
./usr/tests/lib/libm/Atffile tests-lib-tests atf
./usr/tests/lib/libm/t_ceil tests-lib-tests atf
-./usr/tests/lib/libm/t_floor tests-lib-tests atf
+./usr/tests/lib/libm/t_floor tests-obsolete obsolete
./usr/tests/lib/libm/t_infinity tests-lib-tests atf
./usr/tests/lib/libm/t_ldexp tests-lib-tests atf
./usr/tests/lib/libm/t_log tests-lib-tests atf
Index: src/tests/lib/libm/Makefile
diff -u src/tests/lib/libm/Makefile:1.7 src/tests/lib/libm/Makefile:1.8
--- src/tests/lib/libm/Makefile:1.7 Mon Sep 12 15:27:40 2011
+++ src/tests/lib/libm/Makefile Mon Sep 12 16:48:48 2011
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2011/09/12 15:27:40 jruoho Exp $
+# $NetBSD: Makefile,v 1.8 2011/09/12 16:48:48 jruoho Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libm
TESTS_C+= t_ceil
-TESTS_C+= t_floor
TESTS_C+= t_infinity
TESTS_C+= t_ldexp
TESTS_C+= t_log
Index: src/tests/lib/libm/t_ceil.c
diff -u src/tests/lib/libm/t_ceil.c:1.4 src/tests/lib/libm/t_ceil.c:1.5
--- src/tests/lib/libm/t_ceil.c:1.4 Mon Jul 4 22:33:29 2011
+++ src/tests/lib/libm/t_ceil.c Mon Sep 12 16:48:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ceil.c,v 1.4 2011/07/04 22:33:29 mrg Exp $ */
+/* $NetBSD: t_ceil.c,v 1.5 2011/09/12 16:48:48 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,18 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ceil.c,v 1.4 2011/07/04 22:33:29 mrg Exp $");
+__RCSID("$NetBSD: t_ceil.c,v 1.5 2011/09/12 16:48:48 jruoho Exp $");
+#include <atf-c.h>
#include <math.h>
#include <limits.h>
-
-#include <atf-c.h>
-
-ATF_TC(ceil);
-ATF_TC_HEAD(ceil, tc)
-{
- atf_tc_set_md_var(tc, "descr", "A basic test of ceil(3)");
-}
+#include <stdio.h>
#ifdef __vax__
#define SMALL_NUM 1.0e-38
@@ -48,25 +42,73 @@
#define SMALL_NUM 1.0e-40
#endif
-ATF_TC_BODY(ceil, tc)
+ATF_TC(ceil_basic);
+ATF_TC_HEAD(ceil_basic, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "A basic test of ceil(3)");
+}
+
+ATF_TC_BODY(ceil_basic, tc)
{
- const int n = 10240;
- double x, y;
- int i;
+ const double x = 0.999999999999999;
+ const double y = 0.000000000000001;
+
+ ATF_CHECK(fabs(ceil(x) - 1) < SMALL_NUM);
+ ATF_CHECK(fabs(ceil(y) - 1) < SMALL_NUM);
+}
- for (i = 0; i < n; i++) {
+ATF_TC(ceilf_basic);
+ATF_TC_HEAD(ceilf_basic, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "A basic test of ceilf(3)");
+}
- x = i + 0.999999999;
- y = i + 0.000000001;
+ATF_TC_BODY(ceilf_basic, tc)
+{
+ const float x = 0.9999999;
+ const float y = 0.0000001;
- ATF_REQUIRE(fabs(ceil(x) - (double)(i + 1)) < SMALL_NUM);
- ATF_REQUIRE(fabs(ceil(x) - (double)(i + 1)) < SMALL_NUM);
- }
+ ATF_CHECK(fabsf(ceilf(x) - 1) < SMALL_NUM);
+ ATF_CHECK(fabsf(ceilf(y) - 1) < SMALL_NUM);
+}
+
+ATF_TC(floor_basic);
+ATF_TC_HEAD(floor_basic, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "A basic test of floor(3)");
+}
+
+ATF_TC_BODY(floor_basic, tc)
+{
+ const double x = 0.999999999999999;
+ const double y = 0.000000000000001;
+
+ ATF_CHECK(floor(x) < SMALL_NUM);
+ ATF_CHECK(floor(y) < SMALL_NUM);
+}
+
+ATF_TC(floorf_basic);
+ATF_TC_HEAD(floorf_basic, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "A basic test of floorf(3)");
+}
+
+ATF_TC_BODY(floorf_basic, tc)
+{
+ const float x = 0.9999999;
+ const float y = 0.0000001;
+
+ ATF_CHECK(floorf(x) < SMALL_NUM);
+ ATF_CHECK(floorf(y) < SMALL_NUM);
}
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, ceil);
+
+ ATF_TP_ADD_TC(tp, ceil_basic);
+ ATF_TP_ADD_TC(tp, ceilf_basic);
+ ATF_TP_ADD_TC(tp, floorf_basic);
+ ATF_TP_ADD_TC(tp, floorf_basic);
return atf_no_error();
}
