Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/atf Update reachover Makefiles for atf 0.8.



details:   https://anonhg.NetBSD.org/src/rev/d8ac591a2674
branches:  trunk
changeset: 754680:d8ac591a2674
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat May 08 08:12:33 2010 +0000

description:
Update reachover Makefiles for atf 0.8.

diffstat:

 external/bsd/atf/lib/libatf-c/Makefile            |    6 +-
 external/bsd/atf/lib/libatf-c/bconfig.h           |   14 +-
 external/bsd/atf/libexec/Makefile                 |    4 +-
 external/bsd/atf/libexec/atf-cleanup/Makefile     |    4 +-
 external/bsd/atf/libexec/atf-exec/Makefile        |   17 ---
 external/bsd/atf/libexec/atf-format/Makefile      |    4 +-
 external/bsd/atf/tests/atf/Makefile               |   15 ++-
 external/bsd/atf/tests/atf/atf-c/Makefile         |    7 +-
 external/bsd/atf/tests/atf/atf-check/Makefile     |   12 ++
 external/bsd/atf/tests/atf/atf-cleanup/Makefile   |   12 ++
 external/bsd/atf/tests/atf/atf-compile/Makefile   |   16 ++
 external/bsd/atf/tests/atf/atf-config/Makefile    |   12 ++
 external/bsd/atf/tests/atf/atf-report/Makefile    |   15 ++
 external/bsd/atf/tests/atf/atf-run/Makefile       |   28 +++++
 external/bsd/atf/tests/atf/formats/Makefile       |  119 +++++++++++++--------
 external/bsd/atf/tests/atf/test_programs/Makefile |    5 +-
 external/bsd/atf/usr.bin/atf-check/Makefile       |    4 +-
 external/bsd/atf/usr.bin/atf-compile/Makefile     |    4 +-
 external/bsd/atf/usr.bin/atf-config/Makefile      |    4 +-
 external/bsd/atf/usr.bin/atf-report/Makefile      |    4 +-
 external/bsd/atf/usr.bin/atf-run/Makefile         |   11 +-
 external/bsd/atf/usr.bin/atf-version/Makefile     |    6 +-
 22 files changed, 218 insertions(+), 105 deletions(-)

diffs (truncated from 615 to 300 lines):

diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Sat May 08 08:11:03 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Sat May 08 08:12:33 2010 +0000
@@ -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 \
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/lib/libatf-c/bconfig.h
--- a/external/bsd/atf/lib/libatf-c/bconfig.h   Sat May 08 08:11:03 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c/bconfig.h   Sat May 08 08:12:33 2010 +0000
@@ -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@localhost"
 
 /* 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"
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/libexec/Makefile
--- a/external/bsd/atf/libexec/Makefile Sat May 08 08:11:03 2010 +0000
+++ b/external/bsd/atf/libexec/Makefile Sat May 08 08:12:33 2010 +0000
@@ -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>
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/libexec/atf-cleanup/Makefile
--- a/external/bsd/atf/libexec/atf-cleanup/Makefile     Sat May 08 08:11:03 2010 +0000
+++ b/external/bsd/atf/libexec/atf-cleanup/Makefile     Sat May 08 08:12:33 2010 +0000
@@ -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
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/libexec/atf-exec/Makefile
--- a/external/bsd/atf/libexec/atf-exec/Makefile        Sat May 08 08:11:03 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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>
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/libexec/atf-format/Makefile
--- a/external/bsd/atf/libexec/atf-format/Makefile      Sat May 08 08:11:03 2010 +0000
+++ b/external/bsd/atf/libexec/atf-format/Makefile      Sat May 08 08:12:33 2010 +0000
@@ -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
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/tests/atf/Makefile
--- a/external/bsd/atf/tests/atf/Makefile       Sat May 08 08:11:03 2010 +0000
+++ b/external/bsd/atf/tests/atf/Makefile       Sat May 08 08:12:33 2010 +0000
@@ -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
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/tests/atf/atf-c/Makefile
--- a/external/bsd/atf/tests/atf/atf-c/Makefile Sat May 08 08:11:03 2010 +0000
+++ b/external/bsd/atf/tests/atf/atf-c/Makefile Sat May 08 08:12:33 2010 +0000
@@ -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}
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/tests/atf/atf-check/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/atf-check/Makefile     Sat May 08 08:12:33 2010 +0000
@@ -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>
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/tests/atf/atf-cleanup/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/atf-cleanup/Makefile   Sat May 08 08:12:33 2010 +0000
@@ -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>
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/tests/atf/atf-compile/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/atf-compile/Makefile   Sat May 08 08:12:33 2010 +0000
@@ -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>
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/tests/atf/atf-config/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/atf-config/Makefile    Sat May 08 08:12:33 2010 +0000
@@ -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>
diff -r 34d4d95e0b32 -r d8ac591a2674 external/bsd/atf/tests/atf/atf-report/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/atf-report/Makefile    Sat May 08 08:12:33 2010 +0000
@@ -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



Home | Main Index | Thread Index | Old Index