Module Name: src
Committed By: jmmv
Date: Sat Jul 3 08:14:13 UTC 2010
Modified Files:
src/external/bsd/atf: Makefile prepare-import.sh
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/tests/atf: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-check: Makefile
src/external/bsd/atf/tests/atf/atf-config: Makefile
src/external/bsd/atf/tests/atf/atf-report: Makefile
src/external/bsd/atf/tests/atf/atf-run: Makefile
src/external/bsd/atf/tests/atf/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-check: Makefile
src/external/bsd/atf/usr.bin/atf-config: Makefile
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Added Files:
src/external/bsd/atf/tests/atf/test-programs: Makefile
src/external/bsd/atf/usr.bin/atf-version: revision.h
Removed Files:
src/external/bsd/atf/libexec: Makefile
src/external/bsd/atf/libexec/atf-cleanup: Makefile
src/external/bsd/atf/libexec/atf-format: Makefile
src/external/bsd/atf/tests/atf/atf-cleanup: Makefile
src/external/bsd/atf/tests/atf/formats: Makefile
src/external/bsd/atf/tests/atf/test_programs: Makefile
Log Message:
Update reachover makefiles for atf 0.10.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/Makefile \
src/external/bsd/atf/prepare-import.sh
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/libexec/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/libexec/atf-cleanup/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/libexec/atf-format/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-check/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/tests/atf/atf-cleanup/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-config/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-report/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-run/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-sh/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/tests/atf/formats/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/test-programs/Makefile
cvs rdiff -u -r1.4 -r0 src/external/bsd/atf/tests/atf/test_programs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/usr.bin/atf-check/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-version/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/usr.bin/atf-version/revision.h
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/Makefile
diff -u src/external/bsd/atf/Makefile:1.1 src/external/bsd/atf/Makefile:1.2
--- src/external/bsd/atf/Makefile:1.1 Mon Jan 19 07:13:03 2009
+++ src/external/bsd/atf/Makefile Sat Jul 3 08:14:11 2010
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/03 08:14:11 jmmv Exp $
-SUBDIR= etc lib .WAIT libexec share usr.bin tests
+SUBDIR= etc lib .WAIT share usr.bin tests
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/prepare-import.sh
diff -u src/external/bsd/atf/prepare-import.sh:1.1 src/external/bsd/atf/prepare-import.sh:1.2
--- src/external/bsd/atf/prepare-import.sh:1.1 Fri Jun 18 15:39:17 2010
+++ src/external/bsd/atf/prepare-import.sh Sat Jul 3 08:14:11 2010
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.1 2010/06/18 15:39:17 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.2 2010/07/03 08:14:11 jmmv Exp $
#
# Use this script to recreate the 'dist' subdirectory from a newly released
# distfile. The script takes care of unpacking the distfile, removing any
@@ -14,14 +14,11 @@
CLEAN_PATTERNS=
CLEAN_PATTERNS="${CLEAN_PATTERNS} *.m4"
CLEAN_PATTERNS="${CLEAN_PATTERNS} INSTALL"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} Makefile*"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} Makefile* */Makefile*"
CLEAN_PATTERNS="${CLEAN_PATTERNS} admin/[a-qsz]*"
CLEAN_PATTERNS="${CLEAN_PATTERNS} bconfig.h.in"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} bootstrap"
CLEAN_PATTERNS="${CLEAN_PATTERNS} configure*"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/*.sh"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/*.xml"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/standalone"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/text"
CLEAN_PATTERNS="${CLEAN_PATTERNS} m4"
err() {
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 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sat Jul 3 08:14:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/07/03 08:14:11 jmmv Exp $
NOLINT= # defined
@@ -41,16 +41,13 @@
env.c \
error.c \
fs.c \
- io.c \
list.c \
map.c \
process.c \
sanity.c \
text.c \
- ui.c \
user.c \
tc.c \
- tcr.c \
tp.c \
tp_main.c
@@ -63,17 +60,14 @@
error.h \
error_fwd.h \
fs.h \
- io.h \
list.h \
macros.h \
map.h \
process.h \
sanity.h \
tc.h \
- tcr.h \
text.h \
tp.h \
- ui.h \
user.h
INCSDIR= /usr/include/atf-c
@@ -96,7 +90,7 @@
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.10,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.4 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.5
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.4 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Sat Jul 3 08:14:11 2010
@@ -102,7 +102,7 @@
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.9"
+#define PACKAGE_STRING "Automated Testing Framework 0.10"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
@@ -111,10 +111,10 @@
#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.9"
+#define PACKAGE_VERSION "0.10"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.9"
+#define VERSION "0.10"
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.3 src/external/bsd/atf/lib/libatf-c++/Makefile:1.4
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.3 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sat Jul 3 08:14:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/03 08:14:11 jmmv Exp $
NOLINT= # defined
@@ -20,14 +20,12 @@
WARNS?= 2
SRCS= application.cpp \
- atffile.cpp \
build.cpp \
check.cpp \
config.cpp \
env.cpp \
exceptions.cpp \
expand.cpp \
- formats.cpp \
fs.cpp \
io.cpp \
parser.cpp \
@@ -39,14 +37,12 @@
user.cpp
INCS= application.hpp \
- atffile.hpp \
build.hpp \
check.hpp \
config.hpp \
env.hpp \
exceptions.hpp \
expand.hpp \
- formats.hpp \
fs.hpp \
io.hpp \
macros.hpp \
@@ -72,7 +68,7 @@
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.10,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/Makefile
diff -u src/external/bsd/atf/tests/atf/Makefile:1.3 src/external/bsd/atf/tests/atf/Makefile:1.4
--- src/external/bsd/atf/tests/atf/Makefile:1.3 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/tests/atf/Makefile Sat Jul 3 08:14:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/03 08:14:11 jmmv Exp $
.include <bsd.own.mk>
@@ -7,16 +7,14 @@
SUBDIR= atf-c \
atf-c++ \
atf-check \
- atf-cleanup \
atf-config \
atf-report \
atf-run \
atf-sh \
- formats \
- test_programs
+ test-programs
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf
+.PATH: ${SRCDIR}
.include <bsd.test.mk>
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/Makefile:1.4 src/external/bsd/atf/tests/atf/atf-c/Makefile:1.5
--- src/external/bsd/atf/tests/atf/atf-c/Makefile:1.4 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile Sat Jul 3 08:14:11 2010
@@ -1,71 +1,47 @@
-# $NetBSD: Makefile,v 1.4 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/03 08:14:11 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-c
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf/atf-c
+.PATH: ${SRCDIR}/atf-c
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${NETBSDSRCDIR}/external/bsd/atf/lib/libatf-c
-PROGS= h_processes
-SRCS.h_processes= h_processes.c
-MAN.h_processes= # defined
-BINDIR.h_processes= ${TESTSDIR}
+PROGS= process_helpers
+SRCS.process_helpers= process_helpers.c
+MAN.process_helpers= # defined
+BINDIR.process_helpers= ${TESTSDIR}
FILESDIR= ${TESTSDIR}
-FILES= d_include_atf_c_h.c \
- d_include_build_h.c \
- d_include_check_h.c \
- d_include_config_h.c \
- d_include_dynstr_h.c \
- d_include_env_h.c \
- d_include_error_fwd_h.c \
- d_include_error_h.c \
- d_include_fs_h.c \
- d_include_io_h.c \
- d_include_list_h.c \
- d_include_macros_h.c \
- d_include_map_h.c \
- d_include_process_h.c \
- d_include_sanity_h.c \
- d_include_tc_h.c \
- d_include_tcr_h.c \
- d_include_text_h.c \
- d_include_tp_h.c \
- d_include_ui_h.c \
- d_include_user_h.c \
- d_use_macros_h.c
+FILES= macros_h_test.c
TESTS_C=
-.for test in t_atf_c \
- t_build \
- t_check \
- t_config \
- t_dynstr \
- t_env \
- t_error \
- t_fs \
- t_h_lib \
- t_io \
- t_list \
- t_macros \
- t_map \
- t_process \
- t_sanity \
- t_tc \
- t_tcr \
- t_text \
- t_tp \
- t_ui \
- t_user
+.for test in atf_c_test \
+ build_test \
+ check_test \
+ config_test \
+ dynstr_test \
+ env_test \
+ error_test \
+ fs_test \
+ test_helpers_test \
+ list_test \
+ macros_test \
+ map_test \
+ process_test \
+ sanity_test \
+ tc_test \
+ text_test \
+ tp_test \
+ user_test
TESTS_C+= ${test}
-SRCS.${test}= ${test}.c h_lib.c
+SRCS.${test}= ${test}.c test_helpers.c
.endfor
.undef test
-TESTS_SH= t_pkg_config
+TESTS_SH= pkg_config_test
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-c++/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.3 src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.4
--- src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.3 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/tests/atf/atf-c++/Makefile Sat Jul 3 08:14:12 2010
@@ -1,68 +1,44 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/03 08:14:12 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-c++
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf/atf-c++
+.PATH: ${SRCDIR}/atf-c++
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c
FILESDIR= ${TESTSDIR}
-FILES= d_include_application_hpp.cpp \
- d_include_atf_c++_hpp.cpp \
- d_include_atffile_hpp.cpp \
- d_include_build_hpp.cpp \
- d_include_check_hpp.cpp \
- d_include_config_hpp.cpp \
- d_include_env_hpp.cpp \
- d_include_exceptions_hpp.cpp \
- d_include_expand_hpp.cpp \
- d_include_formats_hpp.cpp \
- d_include_fs_hpp.cpp \
- d_include_io_hpp.cpp \
- d_include_macros_hpp.cpp \
- d_include_parser_hpp.cpp \
- d_include_process_hpp.cpp \
- d_include_sanity_hpp.cpp \
- d_include_signals_hpp.cpp \
- d_include_tests_hpp.cpp \
- d_include_text_hpp.cpp \
- d_include_ui_hpp.cpp \
- d_include_user_hpp.cpp \
- d_include_utils_hpp.cpp \
- d_use_macros_hpp.cpp
+FILES= macros_hpp_test.cpp
TESTS_CXX=
-.for test in t_application \
- t_atf_c++ \
- t_atffile \
- t_build \
- t_check \
- t_config \
- t_env \
- t_exceptions \
- t_expand \
- t_formats \
- t_fs \
- t_io \
- t_macros \
- t_parser \
- t_process \
- t_sanity \
- t_signals \
- t_tests \
- t_text \
- t_ui \
- t_user \
- t_utils
+.for test in application_test \
+ atf_c++_test \
+ build_test \
+ check_test \
+ config_test \
+ env_test \
+ exceptions_test \
+ expand_test \
+ fs_test \
+ io_test \
+ macros_test \
+ parser_test \
+ process_test \
+ sanity_test \
+ signals_test \
+ tests_test \
+ text_test \
+ ui_test \
+ user_test \
+ utils_test
TESTS_CXX+= ${test}
-SRCS.${test}= ${test}.cpp h_lib.cpp
+SRCS.${test}= ${test}.cpp test_helpers.cpp
.endfor
.undef test
-TESTS_SH= t_pkg_config
+TESTS_SH= pkg_config_test
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-check/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-check/Makefile:1.1 src/external/bsd/atf/tests/atf/atf-check/Makefile:1.2
--- src/external/bsd/atf/tests/atf/atf-check/Makefile:1.1 Sat May 8 08:12:34 2010
+++ src/external/bsd/atf/tests/atf/atf-check/Makefile Sat Jul 3 08:14:12 2010
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/03 08:14:12 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-check
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf/atf-check
+.PATH: ${SRCDIR}/atf-check
-TESTS_SH= t_integration
+CPPFLAGS+= -DHAVE_CONFIG_H
+
+TESTS_SH= integration_test
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-config/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-config/Makefile:1.1 src/external/bsd/atf/tests/atf/atf-config/Makefile:1.2
--- src/external/bsd/atf/tests/atf/atf-config/Makefile:1.1 Sat May 8 08:12:34 2010
+++ src/external/bsd/atf/tests/atf/atf-config/Makefile Sat Jul 3 08:14:12 2010
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/03 08:14:12 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-config
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf/atf-config
+.PATH: ${SRCDIR}/atf-config
-TESTS_SH= t_integration
+CPPFLAGS+= -DHAVE_CONFIG_H
+
+TESTS_SH= integration_test
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-report/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-report/Makefile:1.2 src/external/bsd/atf/tests/atf/atf-report/Makefile:1.3
--- src/external/bsd/atf/tests/atf/atf-report/Makefile:1.2 Sat Jun 19 10:20:21 2010
+++ src/external/bsd/atf/tests/atf/atf-report/Makefile Sat Jul 3 08:14:12 2010
@@ -1,16 +1,22 @@
-# $NetBSD: Makefile,v 1.2 2010/06/19 10:20:21 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/03 08:14:12 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-report
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf/atf-report
+.PATH: ${SRCDIR}/atf-report
+.PATH: ${SRCDIR}/atf-c++
-TESTS_CXX= h_fail
-TESTS_CXX+= h_misc
-TESTS_CXX+= h_pass
-TESTS_CXX+= h_xfail
-TESTS_SH= t_integration
+TESTS_CXX= fail_helper
+TESTS_CXX+= misc_helpers
+TESTS_CXX+= pass_helper
+TESTS_CXX+= reader_test
+TESTS_SH= integration_test
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}/atf-c++
+
+SRCS.reader_test= reader_test.cpp reader.cpp
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-run/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-run/Makefile:1.2 src/external/bsd/atf/tests/atf/atf-run/Makefile:1.3
--- src/external/bsd/atf/tests/atf/atf-run/Makefile:1.2 Fri Jun 4 08:33:42 2010
+++ src/external/bsd/atf/tests/atf/atf-run/Makefile Sat Jul 3 08:14:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/03 08:14:12 jmmv Exp $
.include <bsd.own.mk>
@@ -6,23 +6,31 @@
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-run
-.PATH: ${SRCDIR}/tests/atf/atf-run
+.PATH: ${SRCDIR}/atf-c++
+.PATH: ${.CURDIR}/../../../lib/libatf-c
+CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${SRCDIR}/atf-run
+CPPFLAGS+= -I${SRCDIR}/atf-c++
+CPPFLAGS+= -I${.CURDIR}/../../../lib/libatf-c
-TESTS_CXX= h_bad_metadata
-TESTS_CXX+= h_fail
-TESTS_CXX+= h_misc
-TESTS_CXX+= h_pass
-TESTS_CXX+= h_several_tcs
-TESTS_CXX+= h_zero_tcs
-TESTS_CXX+= t_config
-TESTS_CXX+= t_requirements
-TESTS_CXX+= t_test_program
-TESTS_SH= t_integration
-
-SRCS.t_config= t_config.cpp config.cpp
-SRCS.t_requirements= t_requirements.cpp requirements.cpp
-SRCS.t_test_program= t_test_program.cpp test-program.cpp timer.cpp
+TESTS_CXX= atffile_test
+TESTS_CXX+= bad_metadata_helper
+TESTS_CXX+= config_test
+TESTS_CXX+= expect_helpers
+TESTS_CXX+= fs_test
+TESTS_CXX+= misc_helpers
+TESTS_CXX+= pass_helper
+TESTS_CXX+= requirements_test
+TESTS_CXX+= several_tcs_helper
+TESTS_CXX+= test_program_test
+TESTS_CXX+= zero_tcs_helper
+TESTS_SH= integration_test
+
+SRCS.atffile_test= atffile_test.cpp atffile.cpp test_helpers.cpp
+SRCS.config_test= config_test.cpp config.cpp test_helpers.cpp
+SRCS.fs_test= fs_test.cpp fs.cpp test_helpers.cpp
+SRCS.requirements_test= requirements_test.cpp requirements.cpp
+SRCS.test_program_test= test_program_test.cpp test-program.cpp fs.cpp timer.cpp
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-sh/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.2 src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.3
--- src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.2 Fri Jun 4 08:33:42 2010
+++ src/external/bsd/atf/tests/atf/atf-sh/Makefile Sat Jul 3 08:14:12 2010
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/03 08:14:12 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-sh
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tests/atf/atf-sh
+.PATH: ${SRCDIR}/atf-sh
-TESTS_SH= h_misc
-TESTS_SH+= t_atf_check
-TESTS_SH+= t_config
-TESTS_SH+= t_integration
-TESTS_SH+= t_normalize
-TESTS_SH+= t_tc
-TESTS_SH+= t_tp
+CPPFLAGS+= -DHAVE_CONFIG_H
+
+TESTS_SH= atf_check_test
+TESTS_SH+= config_test
+TESTS_SH+= integration_test
+TESTS_SH+= misc_helpers
+TESTS_SH+= normalize_test
+TESTS_SH+= tc_test
+TESTS_SH+= tp_test
.include <bsd.test.mk>
Index: src/external/bsd/atf/usr.bin/atf-check/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-check/Makefile:1.2 src/external/bsd/atf/usr.bin/atf-check/Makefile:1.3
--- src/external/bsd/atf/usr.bin/atf-check/Makefile:1.2 Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/usr.bin/atf-check/Makefile Sat Jul 3 08:14:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/03 08:14:13 jmmv Exp $
.include <bsd.own.mk>
@@ -12,6 +12,8 @@
LDADD+= -latf-c++ -latf-c
+CPPFLAGS+= -DHAVE_CONFIG_H
+
WARNS?= 2
.include <bsd.prog.mk>
Index: src/external/bsd/atf/usr.bin/atf-config/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-config/Makefile:1.2 src/external/bsd/atf/usr.bin/atf-config/Makefile:1.3
--- src/external/bsd/atf/usr.bin/atf-config/Makefile:1.2 Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/usr.bin/atf-config/Makefile Sat Jul 3 08:14:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/03 08:14:13 jmmv Exp $
.include <bsd.own.mk>
@@ -12,6 +12,8 @@
LDADD+= -latf-c++ -latf-c
+CPPFLAGS+= -DHAVE_CONFIG_H
+
WARNS?= 2
.include <bsd.prog.mk>
Index: src/external/bsd/atf/usr.bin/atf-report/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-report/Makefile:1.2 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.3
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.2 Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Sat Jul 3 08:14:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/03 08:14:13 jmmv Exp $
.include <bsd.own.mk>
@@ -7,11 +7,13 @@
BINDIR= /usr/bin
PROG_CXX= atf-report
-SRCS= atf-report.cpp
+SRCS= atf-report.cpp reader.cpp
MAN= atf-report.1
LDADD+= -latf-c++ -latf-c
+CPPFLAGS+= -DHAVE_CONFIG_H
+
WARNS?= 2
.include <bsd.prog.mk>
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.6 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.7
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.6 Fri Jun 4 08:33:42 2010
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sat Jul 3 08:14:13 2010
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2010/06/04 08:33:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/03 08:14:13 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-run
.PATH: ${SRCDIR}/atf-run/share
+.PATH: ${.CURDIR}/../../lib/libatf-c
BINDIR= /usr/bin
PROG_CXX= atf-run
-SRCS= atf-run.cpp config.cpp requirements.cpp test-program.cpp \
- timer.cpp
+SRCS= atf-run.cpp atffile.cpp config.cpp fs.cpp requirements.cpp \
+ test-program.cpp timer.cpp
MAN= atf-run.1
CPPFLAGS+= -DHAVE_CONFIG_H
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.1 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.2
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.1 Fri Jun 4 08:33:42 2010
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Sat Jul 3 08:14:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/06/04 08:33:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/03 08:14:13 jmmv Exp $
.include <bsd.own.mk>
@@ -12,6 +12,8 @@
LDADD+= -latf-c++ -latf-c
+CPPFLAGS+= -DHAVE_CONFIG_H
+
WARNS?= 2
.if ${MKSHARE} != "no"
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.4 Fri Jun 4 08:33:42 2010
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Sat Jul 3 08:14:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/06/04 08:33:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/03 08:14:13 jmmv Exp $
.include <bsd.own.mk>
@@ -12,14 +12,9 @@
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
-CPPFLAGS+= -I.
+CPPFLAGS+= -I${.CURDIR}
LDADD+= -latf-c++ -latf-c
WARNS?= 2
-CLEANFILES= revision.h
-atf-version.cpp: revision.h
-revision.h: revision-dist.h
- cp -f ${SRCDIR}/admin/revision-dist.h revision.h
-
.include <bsd.prog.mk>
Added files:
Index: src/external/bsd/atf/tests/atf/test-programs/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/test-programs/Makefile:1.1
--- /dev/null Sat Jul 3 08:14:13 2010
+++ src/external/bsd/atf/tests/atf/test-programs/Makefile Sat Jul 3 08:14:12 2010
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2010/07/03 08:14:12 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/test-programs
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/test-programs
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}/libs -I${SRCDIR}
+
+TESTS_C= c_helpers
+
+TESTS_CXX= cpp_helpers
+
+TESTS_SH= sh_helpers
+.for t in config_test expect_test fork_test meta_data_test result_test \
+ srcdir_test
+TESTS_SH+= ${t}
+TESTS_SH_SRC_${t}= common.sh ${t}.sh
+.endfor
+
+.include <bsd.test.mk>
Index: src/external/bsd/atf/usr.bin/atf-version/revision.h
diff -u /dev/null src/external/bsd/atf/usr.bin/atf-version/revision.h:1.1
--- /dev/null Sat Jul 3 08:14:13 2010
+++ src/external/bsd/atf/usr.bin/atf-version/revision.h Sat Jul 3 08:14:13 2010
@@ -0,0 +1,3 @@
+/* $NetBSD: revision.h,v 1.1 2010/07/03 08:14:13 jmmv Exp $ */
+
+#define PACKAGE_REVISION_TYPE_DIST
