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

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

Module Name:    src
Committed By:   jmmv
Date:           Mon Jan 16 22:41:31 UTC 2012

Modified Files:
        src/external/bsd/atf/dist/atf-c: defs.h.in tc.c tc.h
        src/external/bsd/atf/dist/atf-c++: tests.cpp tests.hpp
        src/external/bsd/atf/dist/atf-c++/detail: process.hpp text.cpp text.hpp
        src/external/bsd/atf/dist/atf-c/detail: process.c process.h
            process_test.c test_helpers.c
        src/external/bsd/atf/dist/atf-config: integration_test.sh
        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 fs.cpp
            integration_test.sh io_test.cpp requirements.cpp test-program.cpp
            test_program_test.cpp timer.cpp timer.hpp
        src/external/bsd/atf/dist/atf-sh: atf-check.cpp atf-check_test.sh
        src/external/bsd/atf/dist/atf-version: atf-version.cpp
        src/external/bsd/atf/dist/doc: atf-test-case.4

Log Message:
Resolve conflicts after the import of atf 0.15.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/defs.h.in
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/dist/atf-c/tc.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c/tc.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/dist/atf-c++/tests.cpp
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/atf-c++/tests.hpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-c++/detail/process.hpp \
    src/external/bsd/atf/dist/atf-c++/detail/text.cpp \
    src/external/bsd/atf/dist/atf-c++/detail/text.hpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/detail/process.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-c/detail/process.h \
    src/external/bsd/atf/dist/atf-c/detail/process_test.c \
    src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/atf/dist/atf-config/integration_test.sh
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/atf-report/atf-report.cpp \
    src/external/bsd/atf/dist/atf-report/tests-results.xsl
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/atf/dist/atf-report/tests-results.css
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/dist/atf-run/atf-run.cpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-run/fs.cpp \
    src/external/bsd/atf/dist/atf-run/requirements.cpp \
    src/external/bsd/atf/dist/atf-run/timer.hpp
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/atf/dist/atf-run/integration_test.sh \
    src/external/bsd/atf/dist/atf-run/io_test.cpp \
    src/external/bsd/atf/dist/atf-run/test_program_test.cpp
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/dist/atf-run/test-program.cpp
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/atf-run/timer.cpp
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
cvs rdiff -u -r1.5 -r1.6 \
    src/external/bsd/atf/dist/atf-version/atf-version.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/doc/atf-test-case.4

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