svn commit: r276672 - in stable/10: contrib/netbsd-tests/lib/libm etc/mtree lib/msun lib/msun/tests

[Garrett Cooper]

Author: ngie
Date: Mon Jan  5 00:02:11 2015
New Revision: 276672
URL: https://svnweb.freebsd.org/changeset/base/276672

Log:
  MFC r274618,r276521:
  
  MFC Note: text corrected for r274618
  
  r274618:
  
    Add reachover Makefiles for contrib/netbsd-tests/lib/msun
  
    A variant of this code has been tested on amd64/i386 for some time by
    EMC/Isilon on 10-STABLE/11-CURRENT. It builds on other architectures, but the
    code will remain off until it's proven it works on virtual hardware or real
    hardware on other architectures
  
    Sponsored by: EMC / Isilon Storage Division
  
  r276521:
  
    Reset errno in :scalbnf_val and :scalbnl_val before running the tests so the
    tested errno isn't stale
  
    This was needed in order for the test to pass on amd64 with stable/10

Added:
  stable/10/lib/msun/Makefile.amd64
     - copied unchanged from r274618, head/lib/msun/Makefile.amd64
  stable/10/lib/msun/Makefile.i386
     - copied unchanged from r274618, head/lib/msun/Makefile.i386
  stable/10/lib/msun/tests/
     - copied from r274618, head/lib/msun/tests/
Modified:
  stable/10/contrib/netbsd-tests/lib/libm/t_scalbn.c
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/lib/msun/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/lib/libm/t_scalbn.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libm/t_scalbn.c	Sun Jan  4 23:41:17 2015	(r276671)
+++ stable/10/contrib/netbsd-tests/lib/libm/t_scalbn.c	Mon Jan  5 00:02:11 2015	(r276672)
@@ -225,6 +225,9 @@ ATF_TC_BODY(scalbnf_val, tc)
 	double rv;
 
 	for (i = 0; i < tcnt; i++) {
+#ifdef __FreeBSD__
+		errno = 0;
+#endif
 		rv = scalbnf(tests[i].inval, tests[i].exp);
 		ATF_CHECK_EQ_MSG(errno, tests[i].error,
 		    "test %zu: errno %d instead of %d", i, errno,
@@ -369,6 +372,9 @@ ATF_TC_BODY(scalbnl_val, tc)
 	long double rv;
 
 	for (i = 0; i < tcnt; i++) {
+#ifdef __FreeBSD__
+		errno = 0;
+#endif
 		rv = scalbnl(tests[i].inval, tests[i].exp);
 		ATF_CHECK_EQ_MSG(errno, tests[i].error,
 		    "test %zu: errno %d instead of %d", i, errno,

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Sun Jan  4 23:41:17 2015	(r276671)
+++ stable/10/etc/mtree/BSD.tests.dist	Mon Jan  5 00:02:11 2015	(r276672)
@@ -99,6 +99,8 @@
             ..
             libutil
             ..
+            msun
+            ..
         ..
         libexec
             atf

Modified: stable/10/lib/msun/Makefile
==============================================================================
--- stable/10/lib/msun/Makefile	Sun Jan  4 23:41:17 2015	(r276671)
+++ stable/10/lib/msun/Makefile	Mon Jan  5 00:02:11 2015	(r276672)
@@ -217,4 +217,8 @@ MLINKS+=tan.3 tanf.3 tan.3 tanl.3
 MLINKS+=tanh.3 tanhf.3 tanh.3 tanhl.3
 MLINKS+=trunc.3 truncf.3 trunc.3 truncl.3
 
+.include <bsd.own.mk>
+
+.include <bsd.arch.inc.mk>
+
 .include <bsd.lib.mk>

Copied: stable/10/lib/msun/Makefile.amd64 (from r274618, head/lib/msun/Makefile.amd64)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/msun/Makefile.amd64	Mon Jan  5 00:02:11 2015	(r276672, copy of r274618, head/lib/msun/Makefile.amd64)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+

Copied: stable/10/lib/msun/Makefile.i386 (from r274618, head/lib/msun/Makefile.i386)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/msun/Makefile.i386	Mon Jan  5 00:02:11 2015	(r276672, copy of r274618, head/lib/msun/Makefile.i386)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+