aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2014-11-04 05:02:22 +0000
committerEnji Cooper <ngie@FreeBSD.org>2014-11-04 05:02:22 +0000
commit068ebf32749921b35beda31c860e2e084da2f7d2 (patch)
tree5e93cb2e5de8e8ed0944625e707c6560b08278c8 /contrib
parente51a35a50c3652970320eddd35c9afd1a0becc3c (diff)
downloadsrc-068ebf32749921b35beda31c860e2e084da2f7d2.tar.gz
src-068ebf32749921b35beda31c860e2e084da2f7d2.zip
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)
Notes
Notes: svn path=/head/; revision=274079
Diffstat (limited to 'contrib')
-rw-r--r--contrib/netbsd-tests/include/t_paths.c5
-rw-r--r--contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c3
-rw-r--r--contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c3
-rw-r--r--contrib/netbsd-tests/lib/libc/gen/t_isnan.c3
-rw-r--r--contrib/netbsd-tests/lib/libc/gen/t_siginfo.c3
-rw-r--r--contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c5
-rw-r--r--contrib/netbsd-tests/lib/libc/sys/t_sigaction.c5
-rw-r--r--contrib/netbsd-tests/lib/libc/time/t_mktime.c5
-rw-r--r--contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c5
-rw-r--r--contrib/netbsd-tests/lib/libm/t_ldexp.c5
-rw-r--r--contrib/netbsd-tests/lib/libm/t_log.c5
-rw-r--r--contrib/netbsd-tests/lib/libm/t_precision.c5
-rw-r--r--contrib/netbsd-tests/lib/libpthread/t_mutex.c5
-rw-r--r--contrib/netbsd-tests/lib/libpthread/t_sem.c5
14 files changed, 22 insertions, 40 deletions
diff --git a/contrib/netbsd-tests/include/t_paths.c b/contrib/netbsd-tests/include/t_paths.c
index 925bb3a8b740..653a70bea24e 100644
--- a/contrib/netbsd-tests/include/t_paths.c
+++ b/contrib/netbsd-tests/include/t_paths.c
@@ -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/02/09 21:26:07 jmmv Exp $");
#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 */
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c b/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
index 9561a3c22652..ef372f76762b 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
@@ -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>
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c b/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c
index 998eb858db80..3366c1f2f5cb 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c
@@ -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>
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_isnan.c b/contrib/netbsd-tests/lib/libc/gen/t_isnan.c
index 2a97b9a91c48..2871e314066e 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_isnan.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_isnan.c
@@ -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>
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c b/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
index e8026214ed05..6dc79531b6e5 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
@@ -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>
diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c b/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c
index a449abcf0a95..8f0f899e2ee4 100644
--- a/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c
@@ -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 <otto@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/09/26 07:24:38 jruoho Exp $");
#include <string.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
#include <fenv.h>
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c b/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c
index 132dbcb6fe15..23ca36a659f8 100644
--- a/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c
+++ b/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c
@@ -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 2012/11/07 16:51:16 pgoyette Exp $");
#include <unistd.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#ifdef __NetBSD__
#include "../../../h_macros.h"
diff --git a/contrib/netbsd-tests/lib/libc/time/t_mktime.c b/contrib/netbsd-tests/lib/libc/time/t_mktime.c
index caef9065cc9e..8092361dbc36 100644
--- a/contrib/netbsd-tests/lib/libc/time/t_mktime.c
+++ b/contrib/netbsd-tests/lib/libc/time/t_mktime.c
@@ -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);
diff --git a/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c b/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c
index b5b573901222..00f716e9c972 100644
--- a/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c
+++ b/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c
@@ -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>
diff --git a/contrib/netbsd-tests/lib/libm/t_ldexp.c b/contrib/netbsd-tests/lib/libm/t_ldexp.c
index 9dd001d413fe..eaf8a4bfdb18 100644
--- a/contrib/netbsd-tests/lib/libm/t_ldexp.c
+++ b/contrib/netbsd-tests/lib/libm/t_ldexp.c
@@ -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>
diff --git a/contrib/netbsd-tests/lib/libm/t_log.c b/contrib/netbsd-tests/lib/libm/t_log.c
index de5a1c649451..016423344be2 100644
--- a/contrib/netbsd-tests/lib/libm/t_log.c
+++ b/contrib/netbsd-tests/lib/libm/t_log.c
@@ -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>
diff --git a/contrib/netbsd-tests/lib/libm/t_precision.c b/contrib/netbsd-tests/lib/libm/t_precision.c
index 390be9dd18aa..777666f297fb 100644
--- a/contrib/netbsd-tests/lib/libm/t_precision.c
+++ b/contrib/netbsd-tests/lib/libm/t_precision.c
@@ -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>
diff --git a/contrib/netbsd-tests/lib/libpthread/t_mutex.c b/contrib/netbsd-tests/lib/libpthread/t_mutex.c
index 1b435c2f43bd..b5b07b31b4f0 100644
--- a/contrib/netbsd-tests/lib/libpthread/t_mutex.c
+++ b/contrib/netbsd-tests/lib/libpthread/t_mutex.c
@@ -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/02/09 21:26:07 jmmv Exp $");
#include <unistd.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#include "h_common.h"
diff --git a/contrib/netbsd-tests/lib/libpthread/t_sem.c b/contrib/netbsd-tests/lib/libpthread/t_sem.c
index 467d182c5fff..a4e03ae9c605 100644
--- a/contrib/netbsd-tests/lib/libpthread/t_sem.c
+++ b/contrib/netbsd-tests/lib/libpthread/t_sem.c
@@ -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/09 19:46:37 joerg Exp $");
#include <unistd.h>
#include <atf-c.h>
-#include <atf-c/config.h>
#include "h_common.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-19 17:31:14 +0000