Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update reachover Makefiles for atf 0.8.

Browse Source
This commit is contained in:
jmmv 2010-05-08 08:12:33 +00:00
parent 0f0f09ce18
commit ac02bdbd72
22 changed files with 218 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/bsd/atf/lib/libatf-c/Makefile vendored
View File

@ -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 @@ SRCS= build.c \
dynstr.c \
env.c \
error.c \
expand.c \
fs.c \
io.c \
list.c \
@ -48,7 +47,6 @@ SRCS= build.c \
object.c \
process.c \
sanity.c \
signals.c \
text.c \
ui.c \
user.c \
@ -65,7 +63,6 @@ INCS= build.h \
env.h \
error.h \
error_fwd.h \
expand.h \
fs.h \
io.h \
list.h \
@ -74,7 +71,6 @@ INCS= build.h \
object.h \
process.h \
sanity.h \
signals.h \
tc.h \
tcr.h \
text.h \

14
external/bsd/atf/lib/libatf-c/bconfig.h vendored
View File

@ -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 "atf-devel@NetBSD.org"
/* 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"

4
external/bsd/atf/libexec/Makefile vendored
View File

@ -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>

4
external/bsd/atf/libexec/atf-cleanup/Makefile vendored
View File

@ -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

17
external/bsd/atf/libexec/atf-exec/Makefile vendored
View File

@ -1,17 +0,0 @@
# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools
BINDIR= /usr/libexec
PROG_CXX= atf-exec
SRCS= atf-exec.cpp
MAN= atf-exec.1
LDADD+= -latf-c++ -latf-c
WARNS?= 2
.include <bsd.prog.mk>

4
external/bsd/atf/libexec/atf-format/Makefile vendored
View File

@ -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

15
external/bsd/atf/tests/atf/Makefile vendored
View File

@ -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

7
external/bsd/atf/tests/atf/atf-c/Makefile vendored
View File

@ -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 @@ FILES= d_include_atf_c_h.c \
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 @@ FILES= d_include_atf_c_h.c \
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 @@ TESTS_C=
t_dynstr \
t_env \
t_error \
t_expand \
t_fs \
t_h_lib \
t_io \
@ -59,10 +56,10 @@ TESTS_C=
t_map \
t_process \
t_sanity \
t_signals \
t_tc \
t_tcr \
t_text \
t_tp \
t_ui \
t_user
TESTS_C+= ${test}

12
external/bsd/atf/tests/atf/atf-check/Makefile vendored Normal file
View File

@ -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>

12
external/bsd/atf/tests/atf/atf-cleanup/Makefile vendored Normal file
View File

@ -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>

16
external/bsd/atf/tests/atf/atf-compile/Makefile vendored Normal file
View File

@ -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>

12
external/bsd/atf/tests/atf/atf-config/Makefile vendored Normal file
View File

@ -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>

15
external/bsd/atf/tests/atf/atf-report/Makefile vendored Normal file
View File

@ -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>

28
external/bsd/atf/tests/atf/atf-run/Makefile vendored Normal file
View File

@ -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>

119
external/bsd/atf/tests/atf/formats/Makefile vendored
View File

@ -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 @@ FILES= d_atffile_1 \
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 \

5
external/bsd/atf/tests/atf/test_programs/Makefile vendored
View File

@ -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_C= h_c
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

4
external/bsd/atf/usr.bin/atf-check/Makefile vendored
View File

@ -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

4
external/bsd/atf/usr.bin/atf-compile/Makefile vendored
View File

@ -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

4
external/bsd/atf/usr.bin/atf-config/Makefile vendored
View File

@ -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

4
external/bsd/atf/usr.bin/atf-report/Makefile vendored
View File

@ -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

11
external/bsd/atf/usr.bin/atf-run/Makefile vendored
View File

@ -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 @@ FILESDIR_atf-c++.pc= /usr/lib/pkgconfig
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 @@ CLEANFILES+= atf-c.pc
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' \

6
external/bsd/atf/usr.bin/atf-version/Makefile vendored
View File

@ -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 @@ MAN= atf-version.1
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
CPPFLAGS+= -I.
CPPFLAGS+= -I..
LDADD+= -latf-c++ -latf-c
WARNS?= 2