svn commit: r274595 - in head: lib/libc/tests/gen tools/regression/lib/libc/gen

[Garrett Cooper]

Author: ngie
Date: Sun Nov 16 20:29:57 2014
New Revision: 274595
URL: https://svnweb.freebsd.org/changeset/base/274595

Log:
  Convert tools/regression/lib/libc/stdio/test-fpclassify into an ATF testcase and
  Rename as lib/libc/stdio/fpclassify2_test
  
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/lib/libc/tests/gen/fpclassify2_test.c
     - copied, changed from r274390, head/tools/regression/lib/libc/gen/test-fpclassify.c
Deleted:
  head/tools/regression/lib/libc/gen/test-fpclassify.c
Modified:
  head/lib/libc/tests/gen/Makefile
  head/tools/regression/lib/libc/gen/Makefile

Modified: head/lib/libc/tests/gen/Makefile
==============================================================================
--- head/lib/libc/tests/gen/Makefile	Sun Nov 16 20:12:49 2014	(r274594)
+++ head/lib/libc/tests/gen/Makefile	Sun Nov 16 20:29:57 2014	(r274595)
@@ -5,6 +5,7 @@
 TESTSDIR=	${TESTSBASE}/lib/libc/gen
 
 ATF_TESTS_C=		arc4random_test
+ATF_TESTS_C+=		fpclassify2_test
 
 # TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid, t_sleep
 # TODO: t_siginfo (fixes require further inspection)

Copied and modified: head/lib/libc/tests/gen/fpclassify2_test.c (from r274390, head/tools/regression/lib/libc/gen/test-fpclassify.c)
==============================================================================
--- head/tools/regression/lib/libc/gen/test-fpclassify.c	Tue Nov 11 18:15:05 2014	(r274390, copy source)
+++ head/lib/libc/tests/gen/fpclassify2_test.c	Sun Nov 16 20:29:57 2014	(r274595)
@@ -26,51 +26,47 @@
  * $FreeBSD$
  */
 
-#include <assert.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <atf-c.h>
 
-int
-main(void)
+ATF_TC_WITHOUT_HEAD(test_fpclassify);
+ATF_TC_BODY(test_fpclassify, tc)
 {
 
-	assert(fpclassify((float)0) == FP_ZERO);
-	assert(fpclassify((float)-0.0) == FP_ZERO);
-	assert(fpclassify((float)1) == FP_NORMAL);
-	assert(fpclassify((float)1000) == FP_NORMAL);
-#ifndef __alpha__
-	assert(fpclassify(0x1.2p-150f) == FP_SUBNORMAL);
-#endif
-	assert(fpclassify(HUGE_VALF) == FP_INFINITE);
-	assert(fpclassify((float)HUGE_VAL) == FP_INFINITE);
-	assert(fpclassify((float)HUGE_VALL) == FP_INFINITE);
-	assert(fpclassify(NAN) == FP_NAN);
-
-	assert(fpclassify((double)0) == FP_ZERO);
-	assert(fpclassify((double)-0) == FP_ZERO);
-	assert(fpclassify((double)1) == FP_NORMAL);
-	assert(fpclassify((double)1000) == FP_NORMAL);
-#ifndef __alpha__
-	assert(fpclassify(0x1.2p-1075) == FP_SUBNORMAL);
-#endif
-	assert(fpclassify(HUGE_VAL) == FP_INFINITE);
-	assert(fpclassify((double)HUGE_VALF) == FP_INFINITE);
-	assert(fpclassify((double)HUGE_VALL) == FP_INFINITE);
-	assert(fpclassify((double)NAN) == FP_NAN);
-
-	assert(fpclassify((long double)0) == FP_ZERO);
-	assert(fpclassify((long double)-0.0) == FP_ZERO);
-	assert(fpclassify((long double)1) == FP_NORMAL);
-	assert(fpclassify((long double)1000) == FP_NORMAL);
-#ifndef __alpha__
-	assert(fpclassify(0x1.2p-16383L) == FP_SUBNORMAL);
-#endif
-	assert(fpclassify(HUGE_VALL) == FP_INFINITE);
-	assert(fpclassify((long double)HUGE_VALF) == FP_INFINITE);
-	assert(fpclassify((long double)HUGE_VAL) == FP_INFINITE);
-	assert(fpclassify((long double)NAN) == FP_NAN);
+	ATF_CHECK(fpclassify((float)0) == FP_ZERO);
+	ATF_CHECK(fpclassify((float)-0.0) == FP_ZERO);
+	ATF_CHECK(fpclassify((float)1) == FP_NORMAL);
+	ATF_CHECK(fpclassify((float)1000) == FP_NORMAL);
+	ATF_CHECK(fpclassify(HUGE_VALF) == FP_INFINITE);
+	ATF_CHECK(fpclassify((float)HUGE_VAL) == FP_INFINITE);
+	ATF_CHECK(fpclassify((float)HUGE_VALL) == FP_INFINITE);
+	ATF_CHECK(fpclassify(NAN) == FP_NAN);
+
+	ATF_CHECK(fpclassify((double)0) == FP_ZERO);
+	ATF_CHECK(fpclassify((double)-0) == FP_ZERO);
+	ATF_CHECK(fpclassify((double)1) == FP_NORMAL);
+	ATF_CHECK(fpclassify((double)1000) == FP_NORMAL);
+	ATF_CHECK(fpclassify(HUGE_VAL) == FP_INFINITE);
+	ATF_CHECK(fpclassify((double)HUGE_VALF) == FP_INFINITE);
+	ATF_CHECK(fpclassify((double)HUGE_VALL) == FP_INFINITE);
+	ATF_CHECK(fpclassify((double)NAN) == FP_NAN);
+
+	ATF_CHECK(fpclassify((long double)0) == FP_ZERO);
+	ATF_CHECK(fpclassify((long double)-0.0) == FP_ZERO);
+	ATF_CHECK(fpclassify((long double)1) == FP_NORMAL);
+	ATF_CHECK(fpclassify((long double)1000) == FP_NORMAL);
+	ATF_CHECK(fpclassify(HUGE_VALL) == FP_INFINITE);
+	ATF_CHECK(fpclassify((long double)HUGE_VALF) == FP_INFINITE);
+	ATF_CHECK(fpclassify((long double)HUGE_VAL) == FP_INFINITE);
+	ATF_CHECK(fpclassify((long double)NAN) == FP_NAN);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, test_fpclassify);
 
-	printf("PASS fpclassify()\n");
-	exit(0);
+	return (atf_no_error());
 }

Modified: head/tools/regression/lib/libc/gen/Makefile
==============================================================================
--- head/tools/regression/lib/libc/gen/Makefile	Sun Nov 16 20:12:49 2014	(r274594)
+++ head/tools/regression/lib/libc/gen/Makefile	Sun Nov 16 20:29:57 2014	(r274595)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 TESTS=	test-fmtcheck test-fmtmsg test-fnmatch \
-	test-fpclassify test-ftw test-popen test-posix_spawn test-wordexp
+	test-ftw test-popen test-posix_spawn test-wordexp
 
 .PHONY: tests
 tests: ${TESTS}