Module Name: src
Committed By: jmmv
Date: Sun Nov 7 17:46:46 UTC 2010
Modified Files:
src/external/bsd/atf/etc/atf: Makefile NetBSD.conf
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-run: Makefile
Added Files:
src/external/bsd/atf/etc/atf: common.conf
Log Message:
Adjust reachover build files after import of atf-0.12.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/etc/atf/Makefile \
src/external/bsd/atf/etc/atf/NetBSD.conf
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/etc/atf/common.conf
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-run/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/etc/atf/Makefile
diff -u src/external/bsd/atf/etc/atf/Makefile:1.2 src/external/bsd/atf/etc/atf/Makefile:1.3
--- src/external/bsd/atf/etc/atf/Makefile:1.2 Fri Jun 4 08:33:40 2010
+++ src/external/bsd/atf/etc/atf/Makefile Sun Nov 7 17:46:45 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/07 17:46:45 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-run/sample
-CONFIGFILES= NetBSD.conf atf-run.hooks
+CONFIGFILES= NetBSD.conf atf-run.hooks common.conf
FILESDIR= /etc/atf
FILESMODE= 644
Index: src/external/bsd/atf/etc/atf/NetBSD.conf
diff -u src/external/bsd/atf/etc/atf/NetBSD.conf:1.2 src/external/bsd/atf/etc/atf/NetBSD.conf:1.3
--- src/external/bsd/atf/etc/atf/NetBSD.conf:1.2 Sat Jun 26 11:27:50 2010
+++ src/external/bsd/atf/etc/atf/NetBSD.conf Sun Nov 7 17:46:45 2010
@@ -7,8 +7,5 @@
# details on the NetBSD test suite.
#
-# When running the test suite as root, some tests require to switch to
-# an unprivileged user to perform extra checks. Set this variable to
-# the user you want to use in those cases. If not set, those tests will
-# be skipped.
-#unprivileged-user = "nobody"
+#variable1 = value1
+#variable2 = value2
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.7 src/external/bsd/atf/lib/libatf-c/Makefile:1.8
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.7 Wed Oct 20 09:20:09 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Nov 7 17:46:46 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/10/20 09:20:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2010/11/07 17:46:46 jmmv Exp $
NOLINT= # defined
@@ -84,7 +84,7 @@
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.11,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.12,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.6 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.7
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.6 Wed Oct 20 09:20:09 2010
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Sun Nov 7 17:46:46 2010
@@ -1,15 +1,6 @@
/* bconfig.h. Generated from bconfig.h.in by configure. */
/* bconfig.h.in. Generated from configure.ac by autoheader. */
-/* Define to the path of chattr(1) if you have it */
-/* #undef CHATTR */
-
-/* Define to 1 if you have chattr(1) */
-/* #undef HAVE_CHATTR */
-
-/* Define to 1 if you have the `chflags' function. */
-#define HAVE_CHFLAGS 1
-
/* Define to 1 if basename takes a constant pointer */
/* #undef HAVE_CONST_BASENAME */
@@ -105,7 +96,7 @@
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.11"
+#define PACKAGE_STRING "Automated Testing Framework 0.12"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
@@ -114,10 +105,10 @@
#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.11"
+#define PACKAGE_VERSION "0.12"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.11"
+#define VERSION "0.12"
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.5 src/external/bsd/atf/lib/libatf-c++/Makefile:1.6
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.5 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Nov 7 17:46:46 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/07 17:46:46 jmmv Exp $
NOLINT= # defined
@@ -53,7 +53,7 @@
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.11,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.12,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/tests/atf/atf-run/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-run/Makefile:1.5 src/external/bsd/atf/tests/atf/atf-run/Makefile:1.6
--- src/external/bsd/atf/tests/atf/atf-run/Makefile:1.5 Wed Oct 20 09:20:12 2010
+++ src/external/bsd/atf/tests/atf/atf-run/Makefile Sun Nov 7 17:46:46 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/07 17:46:46 jmmv Exp $
.include <bsd.own.mk>
@@ -38,8 +38,9 @@
SRCS.io_test= io_test.cpp io.cpp signals.cpp test_helpers.cpp
SRCS.requirements_test= requirements_test.cpp requirements.cpp user.cpp
SRCS.signals_test= signals_test.cpp signals.cpp
-SRCS.test_program_test= fs.cpp io.cpp signals.cpp test_helpers.cpp \
- test_program_test.cpp test-program.cpp timer.cpp
+SRCS.test_program_test= fs.cpp io.cpp requirements.cpp signals.cpp \
+ test_helpers.cpp test_program_test.cpp \
+ test-program.cpp timer.cpp user.cpp
SRCS.user_test= user_test.cpp user.cpp
.include <bsd.test.mk>
Added files:
Index: src/external/bsd/atf/etc/atf/common.conf
diff -u /dev/null src/external/bsd/atf/etc/atf/common.conf:1.1
--- /dev/null Sun Nov 7 17:46:46 2010
+++ src/external/bsd/atf/etc/atf/common.conf Sun Nov 7 17:46:45 2010
@@ -0,0 +1,11 @@
+Content-Type: application/X-atf-config; version="1"
+
+#
+# Sample configuration file for properties affecting all test suites.
+#
+
+# When running the test suite as root, some tests require to switch to
+# an unprivileged user to perform extra checks. Set this variable to
+# the user you want to use in those cases. If not set, those tests will
+# be skipped.
+unprivileged-user = "_atf"
