Module Name: src
Committed By: jmmv
Date: Sat May 8 08:12:35 UTC 2010
Modified Files:
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
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: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/formats: Makefile
src/external/bsd/atf/tests/atf/test_programs: Makefile
src/external/bsd/atf/usr.bin/atf-check: Makefile
src/external/bsd/atf/usr.bin/atf-compile: 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-version: Makefile
Added Files:
src/external/bsd/atf/tests/atf/atf-check: Makefile
src/external/bsd/atf/tests/atf/atf-cleanup: Makefile
src/external/bsd/atf/tests/atf/atf-compile: 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
Removed Files:
src/external/bsd/atf/libexec/atf-exec: Makefile
Log Message:
Update reachover Makefiles for atf 0.8.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-cleanup/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/libexec/atf-exec/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-format/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-check/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-cleanup/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-compile/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-config/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-report/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-run/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/formats/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/atf/tests/atf/test_programs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-check/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-compile/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/atf-version/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/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 Tue Dec 22 13:38:10 2009
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sat May 8 08:12:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/12/22 13:38:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:33 jmmv Exp $
NOLINT= # defined
@@ -40,7 +40,6 @@
dynstr.c \
env.c \
error.c \
- expand.c \
fs.c \
io.c \
list.c \
@@ -48,7 +47,6 @@
object.c \
process.c \
sanity.c \
- signals.c \
text.c \
ui.c \
user.c \
@@ -65,7 +63,6 @@
env.h \
error.h \
error_fwd.h \
- expand.h \
fs.h \
io.h \
list.h \
@@ -74,7 +71,6 @@
object.h \
process.h \
sanity.h \
- signals.h \
tc.h \
tcr.h \
text.h \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.2 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.3
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.2 Tue Dec 22 13:38:10 2009
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Sat May 8 08:12:33 2010
@@ -73,6 +73,10 @@
/* Define to the last valid signal number */
#define LAST_SIGNO 63
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */
@@ -83,25 +87,25 @@
#define PACKAGE_BUGREPORT "[email protected]"
/* Define to the copyright string applicable to this package. */
-#define PACKAGE_COPYRIGHT "Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc."
+#define PACKAGE_COPYRIGHT "Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc."
/* Define to the full name of this package. */
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.7"
+#define PACKAGE_STRING "Automated Testing Framework 0.8"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
/* Define to the home page for this package. */
-#define PACKAGE_URL ""
+#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.7"
+#define PACKAGE_VERSION "0.8"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.7"
+#define VERSION "0.8"
Index: src/external/bsd/atf/libexec/Makefile
diff -u src/external/bsd/atf/libexec/Makefile:1.1 src/external/bsd/atf/libexec/Makefile:1.2
--- src/external/bsd/atf/libexec/Makefile:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/libexec/Makefile Sat May 8 08:12:33 2010
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:33 jmmv Exp $
-SUBDIR= atf-cleanup atf-exec atf-format
+SUBDIR= atf-cleanup atf-format
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/libexec/atf-cleanup/Makefile
diff -u src/external/bsd/atf/libexec/atf-cleanup/Makefile:1.1 src/external/bsd/atf/libexec/atf-cleanup/Makefile:1.2
--- src/external/bsd/atf/libexec/atf-cleanup/Makefile:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/libexec/atf-cleanup/Makefile Sat May 8 08:12:33 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:33 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-cleanup
BINDIR= /usr/libexec
PROG_CXX= atf-cleanup
Index: src/external/bsd/atf/libexec/atf-format/Makefile
diff -u src/external/bsd/atf/libexec/atf-format/Makefile:1.1 src/external/bsd/atf/libexec/atf-format/Makefile:1.2
--- src/external/bsd/atf/libexec/atf-format/Makefile:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/libexec/atf-format/Makefile Sat May 8 08:12:34 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:34 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-format
BINDIR= /usr/libexec
PROG_CXX= atf-format
Index: src/external/bsd/atf/tests/atf/Makefile
diff -u src/external/bsd/atf/tests/atf/Makefile:1.1 src/external/bsd/atf/tests/atf/Makefile:1.2
--- src/external/bsd/atf/tests/atf/Makefile:1.1 Mon Jan 19 07:13:05 2009
+++ src/external/bsd/atf/tests/atf/Makefile Sat May 8 08:12:34 2010
@@ -1,10 +1,21 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:34 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf
-SUBDIR= atf-c atf-c++ atf-sh data formats test_programs tools
+SUBDIR= atf-c \
+ atf-c++ \
+ atf-check \
+ atf-cleanup \
+ atf-compile \
+ atf-config \
+ atf-report \
+ atf-run \
+ atf-sh \
+ data \
+ formats \
+ test_programs
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tests/atf
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/Makefile:1.2 src/external/bsd/atf/tests/atf/atf-c/Makefile:1.3
--- src/external/bsd/atf/tests/atf/atf-c/Makefile:1.2 Tue Dec 22 13:38:10 2009
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile Sat May 8 08:12:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/05/08 08:12:34 jmmv Exp $
.include <bsd.own.mk>
@@ -24,7 +24,6 @@
d_include_env_h.c \
d_include_error_fwd_h.c \
d_include_error_h.c \
- d_include_expand_h.c \
d_include_fs_h.c \
d_include_io_h.c \
d_include_list_h.c \
@@ -33,7 +32,6 @@
d_include_object_h.c \
d_include_process_h.c \
d_include_sanity_h.c \
- d_include_signals_h.c \
d_include_tc_h.c \
d_include_tcr_h.c \
d_include_text_h.c \
@@ -50,7 +48,6 @@
t_dynstr \
t_env \
t_error \
- t_expand \
t_fs \
t_h_lib \
t_io \
@@ -59,10 +56,10 @@
t_map \
t_process \
t_sanity \
- t_signals \
t_tc \
t_tcr \
t_text \
+ t_tp \
t_ui \
t_user
TESTS_C+= ${test}
Index: src/external/bsd/atf/tests/atf/formats/Makefile
diff -u src/external/bsd/atf/tests/atf/formats/Makefile:1.1 src/external/bsd/atf/tests/atf/formats/Makefile:1.2
--- src/external/bsd/atf/tests/atf/formats/Makefile:1.1 Mon Jan 19 07:13:06 2009
+++ src/external/bsd/atf/tests/atf/formats/Makefile Sat May 8 08:12:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:34 jmmv Exp $
.include <bsd.own.mk>
@@ -80,51 +80,78 @@
d_headers_8.experr \
d_headers_9 \
d_headers_9.experr \
- d_tcs_1 \
- d_tcs_1.errin \
- d_tcs_1.expout \
- d_tcs_1.outin \
- d_tcs_2 \
- d_tcs_2.errin \
- d_tcs_2.expout \
- d_tcs_2.outin \
- d_tcs_3 \
- d_tcs_3.errin \
- d_tcs_3.expout \
- d_tcs_3.outin \
- d_tcs_4 \
- d_tcs_4.errin \
- d_tcs_4.expout \
- d_tcs_4.outin \
- d_tcs_5 \
- d_tcs_5.errin \
- d_tcs_5.expout \
- d_tcs_5.outin \
- d_tcs_50 \
- d_tcs_50.experr \
- d_tcs_51 \
- d_tcs_51.experr \
- d_tcs_52 \
- d_tcs_52.experr \
- d_tcs_53 \
- d_tcs_53.experr \
- d_tcs_53.expout \
- d_tcs_54 \
- d_tcs_54.experr \
- d_tcs_54.expout \
- d_tcs_55 \
- d_tcs_55.experr \
- d_tcs_55.expout \
- d_tcs_56 \
- d_tcs_56.errin \
- d_tcs_56.experr \
- d_tcs_56.expout \
- d_tcs_56.outin \
- d_tcs_57 \
- d_tcs_57.errin \
- d_tcs_57.experr \
- d_tcs_57.expout \
- d_tcs_57.outin \
+ d_tcr_1 \
+ d_tcr_1.expout \
+ d_tcr_2 \
+ d_tcr_2.expout \
+ d_tcr_3 \
+ d_tcr_3.expout \
+ d_tcr_50 \
+ d_tcr_50.experr \
+ d_tcr_51 \
+ d_tcr_51.experr \
+ d_tcr_52 \
+ d_tcr_52.experr \
+ d_tcr_53 \
+ d_tcr_53.experr \
+ d_tcr_54 \
+ d_tcr_54.experr \
+ d_tcr_60 \
+ d_tcr_60.experr \
+ d_tcr_61 \
+ d_tcr_61.experr \
+ d_tcr_61.expout \
+ d_tcr_70 \
+ d_tcr_70.experr \
+ d_tcr_70.expout \
+ d_tcr_71 \
+ d_tcr_71.experr \
+ d_tcr_71.expout \
+ d_tcr_72 \
+ d_tcr_72.experr \
+ d_tcr_72.expout \
+ d_tcr_73 \
+ d_tcr_73.experr \
+ d_tcr_73.expout \
+ d_tcr_74 \
+ d_tcr_74.experr \
+ d_tcr_74.expout \
+ d_tcr_75 \
+ d_tcr_75.experr \
+ d_tcr_75.expout \
+ d_tcr_76 \
+ d_tcr_76.experr \
+ d_tcr_76.expout \
+ d_tcr_77 \
+ d_tcr_77.experr \
+ d_tp_1 \
+ d_tp_1.expout \
+ d_tp_2 \
+ d_tp_2.expout \
+ d_tp_3 \
+ d_tp_3.expout \
+ d_tp_4 \
+ d_tp_4.expout \
+ d_tp_50 \
+ d_tp_50.experr \
+ d_tp_51 \
+ d_tp_51.experr \
+ d_tp_52 \
+ d_tp_52.expout \
+ d_tp_53 \
+ d_tp_53.experr \
+ d_tp_54 \
+ d_tp_54.experr \
+ d_tp_55 \
+ d_tp_55.experr \
+ d_tp_56 \
+ d_tp_56.experr \
+ d_tp_57 \
+ d_tp_57.experr \
+ d_tp_58 \
+ d_tp_58.experr \
+ d_tp_59 \
+ d_tp_59.experr \
d_tps_1 \
d_tps_1.expout \
d_tps_2 \
Index: src/external/bsd/atf/tests/atf/test_programs/Makefile
diff -u src/external/bsd/atf/tests/atf/test_programs/Makefile:1.3 src/external/bsd/atf/tests/atf/test_programs/Makefile:1.4
--- src/external/bsd/atf/tests/atf/test_programs/Makefile:1.3 Tue Feb 17 17:29:19 2009
+++ src/external/bsd/atf/tests/atf/test_programs/Makefile Sat May 8 08:12:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/17 17:29:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:34 jmmv Exp $
.include <bsd.own.mk>
@@ -14,8 +14,7 @@
TESTS_CXX= h_cpp
TESTS_SH= h_sh
-.for t in t_cleanup t_config t_env t_fork t_meta_data t_srcdir \
- t_status t_workdir
+.for t in t_config t_fork t_meta_data t_srcdir t_status
TESTS_SH+= ${t}
TESTS_SH_SRC_${t}= common.sh ${t}.sh
.endfor
Index: src/external/bsd/atf/usr.bin/atf-check/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-check/Makefile:1.1 src/external/bsd/atf/usr.bin/atf-check/Makefile:1.2
--- src/external/bsd/atf/usr.bin/atf-check/Makefile:1.1 Mon Jan 19 07:13:06 2009
+++ src/external/bsd/atf/usr.bin/atf-check/Makefile Sat May 8 08:12:35 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-check
BINDIR= /usr/bin
PROG_CXX= atf-check
Index: src/external/bsd/atf/usr.bin/atf-compile/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-compile/Makefile:1.1 src/external/bsd/atf/usr.bin/atf-compile/Makefile:1.2
--- src/external/bsd/atf/usr.bin/atf-compile/Makefile:1.1 Mon Jan 19 07:13:06 2009
+++ src/external/bsd/atf/usr.bin/atf-compile/Makefile Sat May 8 08:12:35 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-compile
BINDIR= /usr/bin
PROG_CXX= atf-compile
Index: src/external/bsd/atf/usr.bin/atf-config/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-config/Makefile:1.1 src/external/bsd/atf/usr.bin/atf-config/Makefile:1.2
--- src/external/bsd/atf/usr.bin/atf-config/Makefile:1.1 Mon Jan 19 07:13:06 2009
+++ src/external/bsd/atf/usr.bin/atf-config/Makefile Sat May 8 08:12:35 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-config
BINDIR= /usr/bin
PROG_CXX= atf-config
Index: src/external/bsd/atf/usr.bin/atf-report/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-report/Makefile:1.1 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.2
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.1 Mon Jan 19 07:13:06 2009
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Sat May 8 08:12:35 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-report
BINDIR= /usr/bin
PROG_CXX= atf-report
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.3 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.4
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.3 Tue Dec 22 13:38:11 2009
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sat May 8 08:12:35 2010
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2009/12/22 13:38:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:35 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/atf-run
.PATH: ${SRCDIR}/data ${SRCDIR}/atf-sh
BINDIR= /usr/bin
PROG_CXX= atf-run
-SRCS= atf-run.cpp
+SRCS= atf-run.cpp config.cpp requirements.cpp test-program.cpp \
+ timer.cpp
MAN= atf-run.1
CPPFLAGS+= -DHAVE_CONFIG_H
@@ -32,7 +33,7 @@
realall: atf-c.pc
atf-c.pc: atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.7,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
@@ -41,7 +42,7 @@
realall: atf-c++.pc
atf-c++.pc: atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.7,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.1 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.2
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.1 Mon Jan 19 07:13:06 2009
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Sat May 8 08:12:35 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:35 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/admin ${SRCDIR}/tools
+.PATH: ${SRCDIR}/admin ${SRCDIR}/atf-version
BINDIR= /usr/bin
PROG_CXX= atf-version
@@ -12,7 +12,7 @@
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
-CPPFLAGS+= -I.
+CPPFLAGS+= -I..
LDADD+= -latf-c++ -latf-c
WARNS?= 2
Added files:
Index: src/external/bsd/atf/tests/atf/atf-check/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-check/Makefile:1.1
--- /dev/null Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/tests/atf/atf-check/Makefile Sat May 8 08:12:34 2010
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-check
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/tests/atf/atf-check
+
+TESTS_SH= t_integration
+
+.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-cleanup/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-cleanup/Makefile:1.1
--- /dev/null Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/tests/atf/atf-cleanup/Makefile Sat May 8 08:12:34 2010
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-cleanup
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/tests/atf/atf-cleanup
+
+TESTS_SH= t_integration
+
+.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-compile/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-compile/Makefile:1.1
--- /dev/null Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/tests/atf/atf-compile/Makefile Sat May 8 08:12:34 2010
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-compile
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/tests/atf/atf-compile
+
+TESTS_SH= t_integration
+
+BINDIR= ${TESTSDIR}
+PROGS_CXX= h_mode
+MAN.h_mode= # empty
+
+.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-config/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-config/Makefile:1.1
--- /dev/null Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/tests/atf/atf-config/Makefile Sat May 8 08:12:34 2010
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-config
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/tests/atf/atf-config
+
+TESTS_SH= t_integration
+
+.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-report/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-report/Makefile:1.1
--- /dev/null Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/tests/atf/atf-report/Makefile Sat May 8 08:12:34 2010
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-report
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/tests/atf/atf-report
+
+TESTS_CXX= h_fail
+TESTS_CXX+= h_misc
+TESTS_CXX+= h_pass
+TESTS_SH= t_integration
+
+.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-run/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-run/Makefile:1.1
--- /dev/null Sat May 8 08:12:35 2010
+++ src/external/bsd/atf/tests/atf/atf-run/Makefile Sat May 8 08:12:34 2010
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-run
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/atf-run
+.PATH: ${SRCDIR}/tests/atf/atf-run
+
+CPPFLAGS+= -I${SRCDIR}
+
+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
+
+.include <bsd.test.mk>
