CVS commit: src/external/bsd/atf/dist

["Julio Merino" <jmmv%netbsd.org@localhost>]

Module Name:    src
Committed By:   jmmv
Date:           Wed Oct 20 09:17:24 UTC 2010

Modified Files:
        src/external/bsd/atf/dist/atf-c: tc.c
        src/external/bsd/atf/dist/atf-c++: tests.cpp tests.hpp
        src/external/bsd/atf/dist/atf-report: atf-report.cpp tests-results.css
            tests-results.xsl
        src/external/bsd/atf/dist/atf-run: atf-run.cpp test-program.cpp
            test-program.hpp
        src/external/bsd/atf/dist/atf-version: atf-version.cpp
Removed Files:
        src/external/bsd/atf/dist/atf-c: dynstr.c dynstr.h dynstr_test.c env.c
            env.h env_test.c fs.c fs.h fs_test.c list.c list.h list_test.c
            map.c map.h map_test.c process.c process.h process_helpers.c
            process_test.c sanity.c sanity.h sanity_test.c test_helpers.c
            test_helpers.h test_helpers_test.c text.c text.h text_test.c
            tp_main.c user.c user.h user_test.c
        src/external/bsd/atf/dist/atf-c++: application.cpp application.hpp
            application_test.cpp env.cpp env.hpp env_test.cpp exceptions.cpp
            exceptions.hpp exceptions_test.cpp expand.cpp expand.hpp
            expand_test.cpp fs.cpp fs.hpp fs_test.cpp io.cpp io.hpp io_test.cpp
            parser.cpp parser.hpp parser_test.cpp process.cpp process.hpp
            process_test.cpp sanity.hpp sanity_test.cpp signals.cpp signals.hpp
            signals_test.cpp test_helpers.cpp test_helpers.hpp text.cpp
            text.hpp text_test.cpp ui.cpp ui.hpp ui_test.cpp user.cpp user.hpp
            user_test.cpp
        src/external/bsd/atf/dist/atf-check: Atffile atf-check.1 atf-check.cpp
            integration_test.sh

Log Message:
Resolve import conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r0 src/external/bsd/atf/dist/atf-c/dynstr.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/dynstr.h \
    src/external/bsd/atf/dist/atf-c/text.c \
    src/external/bsd/atf/dist/atf-c/text.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-c/dynstr_test.c \
    src/external/bsd/atf/dist/atf-c/env.c \
    src/external/bsd/atf/dist/atf-c/env.h \
    src/external/bsd/atf/dist/atf-c/env_test.c \
    src/external/bsd/atf/dist/atf-c/fs_test.c \
    src/external/bsd/atf/dist/atf-c/list_test.c \
    src/external/bsd/atf/dist/atf-c/map_test.c \
    src/external/bsd/atf/dist/atf-c/process_helpers.c \
    src/external/bsd/atf/dist/atf-c/process_test.c \
    src/external/bsd/atf/dist/atf-c/sanity.c \
    src/external/bsd/atf/dist/atf-c/sanity.h \
    src/external/bsd/atf/dist/atf-c/sanity_test.c \
    src/external/bsd/atf/dist/atf-c/test_helpers.c \
    src/external/bsd/atf/dist/atf-c/test_helpers.h \
    src/external/bsd/atf/dist/atf-c/test_helpers_test.c \
    src/external/bsd/atf/dist/atf-c/text_test.c \
    src/external/bsd/atf/dist/atf-c/user.c \
    src/external/bsd/atf/dist/atf-c/user.h \
    src/external/bsd/atf/dist/atf-c/user_test.c
cvs rdiff -u -r1.5 -r0 src/external/bsd/atf/dist/atf-c/fs.c
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/atf/dist/atf-c/fs.h \
    src/external/bsd/atf/dist/atf-c/map.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/atf-c/list.c \
    src/external/bsd/atf/dist/atf-c/list.h \
    src/external/bsd/atf/dist/atf-c/map.h \
    src/external/bsd/atf/dist/atf-c/process.c \
    src/external/bsd/atf/dist/atf-c/process.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/dist/atf-c/tc.c
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/atf/dist/atf-c/tp_main.c
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/atf/dist/atf-c++/application.cpp \
    src/external/bsd/atf/dist/atf-c++/application.hpp \
    src/external/bsd/atf/dist/atf-c++/fs.cpp \
    src/external/bsd/atf/dist/atf-c++/fs.hpp \
    src/external/bsd/atf/dist/atf-c++/process.hpp
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/atf/dist/atf-c++/application_test.cpp \
    src/external/bsd/atf/dist/atf-c++/env.cpp \
    src/external/bsd/atf/dist/atf-c++/env.hpp \
    src/external/bsd/atf/dist/atf-c++/env_test.cpp \
    src/external/bsd/atf/dist/atf-c++/exceptions.hpp \
    src/external/bsd/atf/dist/atf-c++/exceptions_test.cpp \
    src/external/bsd/atf/dist/atf-c++/expand_test.cpp \
    src/external/bsd/atf/dist/atf-c++/fs_test.cpp \
    src/external/bsd/atf/dist/atf-c++/parser_test.cpp \
    src/external/bsd/atf/dist/atf-c++/process_test.cpp \
    src/external/bsd/atf/dist/atf-c++/sanity.hpp \
    src/external/bsd/atf/dist/atf-c++/sanity_test.cpp \
    src/external/bsd/atf/dist/atf-c++/signals_test.cpp \
    src/external/bsd/atf/dist/atf-c++/test_helpers.cpp \
    src/external/bsd/atf/dist/atf-c++/test_helpers.hpp \
    src/external/bsd/atf/dist/atf-c++/text_test.cpp \
    src/external/bsd/atf/dist/atf-c++/ui.hpp \
    src/external/bsd/atf/dist/atf-c++/ui_test.cpp \
    src/external/bsd/atf/dist/atf-c++/user.cpp \
    src/external/bsd/atf/dist/atf-c++/user.hpp \
    src/external/bsd/atf/dist/atf-c++/user_test.cpp
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c++/exceptions.cpp \
    src/external/bsd/atf/dist/atf-c++/expand.cpp \
    src/external/bsd/atf/dist/atf-c++/expand.hpp \
    src/external/bsd/atf/dist/atf-c++/signals.cpp \
    src/external/bsd/atf/dist/atf-c++/signals.hpp \
    src/external/bsd/atf/dist/atf-c++/text.cpp \
    src/external/bsd/atf/dist/atf-c++/text.hpp \
    src/external/bsd/atf/dist/atf-c++/ui.cpp
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/dist/atf-c++/io.cpp \
    src/external/bsd/atf/dist/atf-c++/io.hpp \
    src/external/bsd/atf/dist/atf-c++/io_test.cpp
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/atf-c++/parser.cpp \
    src/external/bsd/atf/dist/atf-c++/parser.hpp \
    src/external/bsd/atf/dist/atf-c++/process.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c++/tests.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c++/tests.hpp
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-check/Atffile \
    src/external/bsd/atf/dist/atf-check/integration_test.sh
cvs rdiff -u -r1.3 -r0 src/external/bsd/atf/dist/atf-check/atf-check.1
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-check/atf-check.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-report/atf-report.cpp
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/atf/dist/atf-report/tests-results.css
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/atf/dist/atf-report/tests-results.xsl
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/atf-run/atf-run.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-run/test-program.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-run/test-program.hpp
cvs rdiff -u -r1.4 -r1.5 \
    src/external/bsd/atf/dist/atf-version/atf-version.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.