Author: ngie
Date: Tue Nov 4 05:02:22 2014
New Revision: 274079
URL: https://svnweb.freebsd.org/changeset/base/274079
Log:
Import proper fix for misc/49356 (/usr/include/atf-c/config.h) after
atf-c/config.h
was removed from the build
Pointyhat to: me (again, for not running make delete-old after running test
builds)
Modified:
head/contrib/netbsd-tests/include/t_paths.c
head/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
head/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c
head/contrib/netbsd-tests/lib/libc/gen/t_isnan.c
head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
head/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c
head/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c
head/contrib/netbsd-tests/lib/libc/time/t_mktime.c
head/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c
head/contrib/netbsd-tests/lib/libm/t_ldexp.c
head/contrib/netbsd-tests/lib/libm/t_log.c
head/contrib/netbsd-tests/lib/libm/t_precision.c
head/contrib/netbsd-tests/lib/libpthread/t_mutex.c
head/contrib/netbsd-tests/lib/libpthread/t_sem.c
head/share/mk/bsd.progs.mk
head/share/mk/netbsd-tests.test.mk
Modified: head/contrib/netbsd-tests/include/t_paths.c
==============================================================================
--- head/contrib/netbsd-tests/include/t_paths.c Tue Nov 4 02:00:07 2014
(r274078)
+++ head/contrib/netbsd-tests/include/t_paths.c Tue Nov 4 05:02:22 2014
(r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_paths.c,v 1.13 2014/02/09 21:26:07 jmmv Exp $ */
+/* $NetBSD: t_paths.c,v 1.14 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_paths.c,v 1.13 2014/02/09 21:26:07 jmmv Exp $");
+__RCSID("$NetBSD: t_paths.c,v 1.14 2014/11/04 00:20:19 justin Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -42,7 +42,6 @@ __RCSID("$NetBSD: t_paths.c,v 1.13 2014/
#include <unistd.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#define PATH_DEV __BIT(0) /* A device node */
#define PATH_DIR __BIT(1) /* A directory */
Modified: head/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c Tue Nov 4
02:00:07 2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c Tue Nov 4
05:02:22 2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_floatunditf.c,v 1.5 2014/02/02 08:16:22 martin Exp $ */
+/* $NetBSD: t_floatunditf.c,v 1.6 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -27,7 +27,6 @@
*/
#include <atf-c.h>
-#include <atf-c/config.h>
#include <inttypes.h>
#include <math.h>
Modified: head/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c Tue Nov 4
02:00:07 2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c Tue Nov 4
05:02:22 2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fpsetmask.c,v 1.13 2014/02/09 21:26:07 jmmv Exp $ */
+/* $NetBSD: t_fpsetmask.c,v 1.14 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -29,7 +29,6 @@
#include <sys/param.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#include <stdio.h>
#include <signal.h>
Modified: head/contrib/netbsd-tests/lib/libc/gen/t_isnan.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/gen/t_isnan.c Tue Nov 4 02:00:07
2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libc/gen/t_isnan.c Tue Nov 4 05:02:22
2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_isnan.c,v 1.4 2014/02/09 21:26:07 jmmv Exp $ */
+/* $NetBSD: t_isnan.c,v 1.5 2014/11/04 00:20:19 justin Exp $ */
/*
* This file is in the Public Domain.
@@ -10,7 +10,6 @@
#include <sys/param.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#include <math.h>
#include <string.h>
Modified: head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Tue Nov 4 02:00:07
2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Tue Nov 4 05:02:22
2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_siginfo.c,v 1.23 2014/02/09 21:26:07 jmmv Exp $ */
+/* $NetBSD: t_siginfo.c,v 1.24 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,7 +27,6 @@
*/
#include <atf-c.h>
-#include <atf-c/config.h>
#if defined(__NetBSD__)
#include <sys/inttypes.h>
Modified: head/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c Tue Nov 4
02:00:07 2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c Tue Nov 4
05:02:22 2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strtod.c,v 1.31 2012/09/26 07:24:38 jruoho Exp $ */
+/* $NetBSD: t_strtod.c,v 1.32 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/* Public domain, Otto Moerbeek <o...@drijf.net>, 2006. */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_strtod.c,v 1.31 2012/09/26 07:24:38 jruoho Exp $");
+__RCSID("$NetBSD: t_strtod.c,v 1.32 2014/11/04 00:20:19 justin Exp $");
#include <errno.h>
#include <math.h>
@@ -41,7 +41,6 @@ __RCSID("$NetBSD: t_strtod.c,v 1.31 2012
#include <string.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
#include <fenv.h>
Modified: head/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c Tue Nov 4
02:00:07 2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c Tue Nov 4
05:02:22 2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sigaction.c,v 1.2 2012/11/07 16:51:16 pgoyette Exp $ */
+/* $NetBSD: t_sigaction.c,v 1.3 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2010\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sigaction.c,v 1.2 2012/11/07 16:51:16 pgoyette Exp $");
+__RCSID("$NetBSD: t_sigaction.c,v 1.3 2014/11/04 00:20:19 justin Exp $");
#include <sys/wait.h>
@@ -40,7 +40,6 @@ __RCSID("$NetBSD: t_sigaction.c,v 1.2 20
#include <unistd.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#ifdef __NetBSD__
#include "../../../h_macros.h"
Modified: head/contrib/netbsd-tests/lib/libc/time/t_mktime.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/time/t_mktime.c Tue Nov 4 02:00:07
2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libc/time/t_mktime.c Tue Nov 4 05:02:22
2014 (r274079)
@@ -72,12 +72,7 @@ ATF_TC_BODY(mktime_negyear, tc)
errno = 0;
t = mktime(&tms);
-#if defined(__FreeBSD__)
- /* Open Group says "and may set errno to indicate the error" */
- ATF_REQUIRE(t == (time_t)-1);
-#else
ATF_REQUIRE_ERRNO(0, t != (time_t)-1);
-#endif
}
ATF_TC(timegm_epoch);
Modified: head/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c Tue Nov 4
02:00:07 2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c Tue Nov 4
05:02:22 2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_backtrace.c,v 1.15 2014/05/01 03:46:11 joerg Exp $ */
+/* $NetBSD: t_backtrace.c,v 1.16 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,10 +29,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_backtrace.c,v 1.15 2014/05/01 03:46:11 joerg Exp $");
+__RCSID("$NetBSD: t_backtrace.c,v 1.16 2014/11/04 00:20:19 justin Exp $");
#include <atf-c.h>
-#include <atf-c/config.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
Modified: head/contrib/netbsd-tests/lib/libm/t_ldexp.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libm/t_ldexp.c Tue Nov 4 02:00:07
2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libm/t_ldexp.c Tue Nov 4 05:02:22
2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ldexp.c,v 1.13 2014/03/12 21:40:07 martin Exp $ */
+/* $NetBSD: t_ldexp.c,v 1.14 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,12 +29,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ldexp.c,v 1.13 2014/03/12 21:40:07 martin Exp $");
+__RCSID("$NetBSD: t_ldexp.c,v 1.14 2014/11/04 00:20:19 justin Exp $");
#include <sys/param.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#include <math.h>
#include <limits.h>
Modified: head/contrib/netbsd-tests/lib/libm/t_log.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libm/t_log.c Tue Nov 4 02:00:07 2014
(r274078)
+++ head/contrib/netbsd-tests/lib/libm/t_log.c Tue Nov 4 05:02:22 2014
(r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_log.c,v 1.11 2014/03/03 10:39:08 martin Exp $ */
+/* $NetBSD: t_log.c,v 1.12 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,10 +29,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_log.c,v 1.11 2014/03/03 10:39:08 martin Exp $");
+__RCSID("$NetBSD: t_log.c,v 1.12 2014/11/04 00:20:19 justin Exp $");
#include <atf-c.h>
-#include <atf-c/config.h>
#include <math.h>
#include <stdio.h>
Modified: head/contrib/netbsd-tests/lib/libm/t_precision.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libm/t_precision.c Tue Nov 4 02:00:07
2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libm/t_precision.c Tue Nov 4 05:02:22
2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_precision.c,v 1.1 2013/11/11 11:10:45 joerg Exp $ */
+/* $NetBSD: t_precision.c,v 1.2 2014/11/04 00:20:19 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -29,10 +29,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_precision.c,v 1.1 2013/11/11 11:10:45 joerg Exp $");
+__RCSID("$NetBSD: t_precision.c,v 1.2 2014/11/04 00:20:19 justin Exp $");
#include <atf-c.h>
-#include <atf-c/config.h>
#include <float.h>
#include <stdlib.h>
Modified: head/contrib/netbsd-tests/lib/libpthread/t_mutex.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Tue Nov 4 02:00:07
2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libpthread/t_mutex.c Tue Nov 4 05:02:22
2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mutex.c,v 1.6 2014/02/09 21:26:07 jmmv Exp $ */
+/* $NetBSD: t_mutex.c,v 1.7 2014/11/04 00:20:19 justin Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_mutex.c,v 1.6 2014/02/09 21:26:07 jmmv Exp $");
+__RCSID("$NetBSD: t_mutex.c,v 1.7 2014/11/04 00:20:19 justin Exp $");
#include <pthread.h>
#include <stdio.h>
@@ -37,7 +37,6 @@ __RCSID("$NetBSD: t_mutex.c,v 1.6 2014/0
#include <unistd.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#include "h_common.h"
Modified: head/contrib/netbsd-tests/lib/libpthread/t_sem.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libpthread/t_sem.c Tue Nov 4 02:00:07
2014 (r274078)
+++ head/contrib/netbsd-tests/lib/libpthread/t_sem.c Tue Nov 4 05:02:22
2014 (r274079)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sem.c,v 1.7 2012/03/09 19:46:37 joerg Exp $ */
+/* $NetBSD: t_sem.c,v 1.8 2014/11/04 00:20:19 justin Exp $ */
/*
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sem.c,v 1.7 2012/03/09 19:46:37 joerg Exp $");
+__RCSID("$NetBSD: t_sem.c,v 1.8 2014/11/04 00:20:19 justin Exp $");
#include <errno.h>
#include <fcntl.h>
@@ -99,7 +99,6 @@ __RCSID("$NetBSD: t_sem.c,v 1.7 2012/03/
#include <unistd.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#include "h_common.h"
Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk Tue Nov 4 02:00:07 2014 (r274078)
+++ head/share/mk/bsd.progs.mk Tue Nov 4 05:02:22 2014 (r274079)
@@ -42,7 +42,7 @@ PROG ?= $t
.if defined(PROG)
# just one of many
-PROG_OVERRIDE_VARS += BINDIR MAN SRCS
+PROG_OVERRIDE_VARS += BINDIR DPSRCS MAN SRCS
PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LDFLAGS
${PROG_OVERRIDE_VARS}
.for v in ${PROG_VARS:O:u}
.if empty(${PROG_OVERRIDE_VARS:M$v})
@@ -75,6 +75,12 @@ UPDATE_DEPENDFILE = NO
.endif
.endif
+# The non-recursive call to bsd.progs.mk will handle FILES; NUL out
+# FILESGROUPS so recursive calls don't duplicate the work
+.ifdef _RECURSING_PROGS
+FILESGROUPS=
+.endif
+
# handle being called [bsd.]progs.mk
.include <bsd.prog.mk>
Modified: head/share/mk/netbsd-tests.test.mk
==============================================================================
--- head/share/mk/netbsd-tests.test.mk Tue Nov 4 02:00:07 2014
(r274078)
+++ head/share/mk/netbsd-tests.test.mk Tue Nov 4 05:02:22 2014
(r274079)
@@ -21,9 +21,6 @@ LIBNETBSD_SRCDIR= ${SRCTOP}/lib/libnetbs
LIBNETBSD_OBJDIR= ${OBJTOP}/lib/libnetbsd
.for t in ${NETBSD_ATF_TESTS_C}
-# XXX: needed for atf-c/config.h after v0.2.1 upgrade. See NetBSD PR #
-# misc/49356 for more details
-CFLAGS.$t+= -I${SRCTOP}/contrib/atf
CFLAGS.$t+= -I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests
LDFLAGS.$t+= -L${LIBNETBSD_OBJDIR}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
