Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/atf/dist Fix merge conflicts for atf 0.10.
details: https://anonhg.NetBSD.org/src/rev/24bcf067a5e2
branches: trunk
changeset: 756014:24bcf067a5e2
user: jmmv <jmmv%NetBSD.org@localhost>
date: Sat Jul 03 08:11:25 2010 +0000
description:
Fix merge conflicts for atf 0.10.
diffstat:
external/bsd/atf/dist/admin/revision-dist.h | 5 -
external/bsd/atf/dist/atf-c++/atffile.cpp | 187 -
external/bsd/atf/dist/atf-c++/atffile.hpp | 70 -
external/bsd/atf/dist/atf-c++/formats.cpp | 1328 -
external/bsd/atf/dist/atf-c++/formats.hpp | 227 -
external/bsd/atf/dist/atf-c++/tests.cpp | 255 +-
external/bsd/atf/dist/atf-c++/tests.hpp | 72 +-
external/bsd/atf/dist/atf-c/fs.c | 255 -
external/bsd/atf/dist/atf-c/io.c | 173 -
external/bsd/atf/dist/atf-c/io.h | 51 -
external/bsd/atf/dist/atf-c/tc.c | 1065 +-
external/bsd/atf/dist/atf-c/tcr.c | 347 -
external/bsd/atf/dist/atf-c/tcr.h | 80 -
external/bsd/atf/dist/atf-c/ui.c | 213 -
external/bsd/atf/dist/atf-c/ui.h | 48 -
external/bsd/atf/dist/atf-check/atf-check.1 | 69 +-
external/bsd/atf/dist/atf-cleanup/atf-cleanup.1 | 69 -
external/bsd/atf/dist/atf-cleanup/atf-cleanup.cpp | 78 -
external/bsd/atf/dist/atf-format/atf-format.1 | 90 -
external/bsd/atf/dist/atf-format/atf-format.cpp | 144 -
external/bsd/atf/dist/atf-report/atf-report.cpp | 102 +-
external/bsd/atf/dist/atf-run/atf-run.cpp | 211 +-
external/bsd/atf/dist/atf-run/test-program.cpp | 372 +-
external/bsd/atf/dist/atf-run/test-program.hpp | 97 +-
external/bsd/atf/dist/atf-version/atf-version.cpp | 28 +-
external/bsd/atf/dist/tests/atf/Atffile | 14 -
external/bsd/atf/dist/tests/atf/atf-c++/Atffile | 25 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_application_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_atf_c++_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_atffile_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_build_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_check_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_config_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_env_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_exceptions_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_expand_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_formats_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_fs_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_io_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_macros_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_parser_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_process_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_sanity_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_signals_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_tests_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_text_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_ui_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_user_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_include_utils_hpp.cpp | 1 -
external/bsd/atf/dist/tests/atf/atf-c++/d_use_macros_hpp.cpp | 107 -
external/bsd/atf/dist/tests/atf/atf-c++/h_lib.cpp | 104 -
external/bsd/atf/dist/tests/atf/atf-c++/h_lib.hpp | 100 -
external/bsd/atf/dist/tests/atf/atf-c++/t_application.cpp | 48 -
external/bsd/atf/dist/tests/atf/atf-c++/t_atf_c++.cpp | 48 -
external/bsd/atf/dist/tests/atf/atf-c++/t_atffile.cpp | 230 -
external/bsd/atf/dist/tests/atf/atf-c++/t_build.cpp | 247 -
external/bsd/atf/dist/tests/atf/atf-c++/t_check.cpp | 414 -
external/bsd/atf/dist/tests/atf/atf-c++/t_config.cpp | 233 -
external/bsd/atf/dist/tests/atf/atf-c++/t_env.cpp | 101 -
external/bsd/atf/dist/tests/atf/atf-c++/t_exceptions.cpp | 157 -
external/bsd/atf/dist/tests/atf/atf-c++/t_expand.cpp | 282 -
external/bsd/atf/dist/tests/atf/atf-c++/t_formats.cpp | 48 -
external/bsd/atf/dist/tests/atf/atf-c++/t_fs.cpp | 894 -
external/bsd/atf/dist/tests/atf/atf-c++/t_io.cpp | 585 -
external/bsd/atf/dist/tests/atf/atf-c++/t_macros.cpp | 367 -
external/bsd/atf/dist/tests/atf/atf-c++/t_parser.cpp | 759 -
external/bsd/atf/dist/tests/atf/atf-c++/t_pkg_config.sh | 151 -
external/bsd/atf/dist/tests/atf/atf-c++/t_process.cpp | 367 -
external/bsd/atf/dist/tests/atf/atf-c++/t_sanity.cpp | 48 -
external/bsd/atf/dist/tests/atf/atf-c++/t_signals.cpp | 283 -
external/bsd/atf/dist/tests/atf/atf-c++/t_tests.cpp | 353 -
external/bsd/atf/dist/tests/atf/atf-c++/t_text.cpp | 375 -
external/bsd/atf/dist/tests/atf/atf-c++/t_ui.cpp | 48 -
external/bsd/atf/dist/tests/atf/atf-c++/t_user.cpp | 152 -
external/bsd/atf/dist/tests/atf/atf-c++/t_utils.cpp | 308 -
external/bsd/atf/dist/tests/atf/atf-c/Atffile | 5 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_atf_c_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_build_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_check_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_config_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_dynstr_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_env_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_error_fwd_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_error_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_fs_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_io_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_list_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_macros_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_map_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_process_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_sanity_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_tc_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_tcr_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_text_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_tp_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_ui_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_include_user_h.c | 1 -
external/bsd/atf/dist/tests/atf/atf-c/d_use_macros_h.c | 83 -
external/bsd/atf/dist/tests/atf/atf-c/h_build.h | 414 -
external/bsd/atf/dist/tests/atf/atf-c/h_lib.c | 179 -
external/bsd/atf/dist/tests/atf/atf-c/h_lib.h | 68 -
external/bsd/atf/dist/tests/atf/atf-c/h_processes.c | 117 -
external/bsd/atf/dist/tests/atf/atf-c/t_atf_c.c | 50 -
external/bsd/atf/dist/tests/atf/atf-c/t_build.c | 286 -
external/bsd/atf/dist/tests/atf/atf-c/t_check.c | 577 -
external/bsd/atf/dist/tests/atf/atf-c/t_config.c | 157 -
external/bsd/atf/dist/tests/atf/atf-c/t_dynstr.c | 647 -
external/bsd/atf/dist/tests/atf/atf-c/t_env.c | 126 -
external/bsd/atf/dist/tests/atf/atf-c/t_error.c | 311 -
external/bsd/atf/dist/tests/atf/atf-c/t_fs.c | 1225 -
external/bsd/atf/dist/tests/atf/atf-c/t_h_lib.c | 105 -
external/bsd/atf/dist/tests/atf/atf-c/t_io.c | 207 -
external/bsd/atf/dist/tests/atf/atf-c/t_list.c | 336 -
external/bsd/atf/dist/tests/atf/atf-c/t_macros.c | 665 -
external/bsd/atf/dist/tests/atf/atf-c/t_map.c | 331 -
external/bsd/atf/dist/tests/atf/atf-c/t_pkg_config.sh | 152 -
external/bsd/atf/dist/tests/atf/atf-c/t_process.c | 1161 -
external/bsd/atf/dist/tests/atf/atf-c/t_sanity.c | 265 -
external/bsd/atf/dist/tests/atf/atf-c/t_tc.c | 201 -
external/bsd/atf/dist/tests/atf/atf-c/t_tcr.c | 268 -
external/bsd/atf/dist/tests/atf/atf-c/t_text.c | 434 -
external/bsd/atf/dist/tests/atf/atf-c/t_tp.c | 50 -
external/bsd/atf/dist/tests/atf/atf-c/t_ui.c | 497 -
external/bsd/atf/dist/tests/atf/atf-c/t_user.c | 151 -
external/bsd/atf/dist/tests/atf/atf-check/Atffile | 5 -
external/bsd/atf/dist/tests/atf/atf-check/t_integration.sh | 308 -
external/bsd/atf/dist/tests/atf/atf-cleanup/Atffile | 5 -
external/bsd/atf/dist/tests/atf/atf-cleanup/t_integration.sh | 222 -
external/bsd/atf/dist/tests/atf/atf-config/Atffile | 5 -
external/bsd/atf/dist/tests/atf/atf-config/t_integration.sh | 227 -
external/bsd/atf/dist/tests/atf/atf-report/Atffile | 5 -
external/bsd/atf/dist/tests/atf/atf-report/h_fail.cpp | 45 -
external/bsd/atf/dist/tests/atf/atf-report/h_misc.cpp | 68 -
external/bsd/atf/dist/tests/atf/atf-report/h_pass.cpp | 44 -
external/bsd/atf/dist/tests/atf/atf-report/t_integration.sh | 362 -
external/bsd/atf/dist/tests/atf/atf-run/Atffile | 5 -
external/bsd/atf/dist/tests/atf/atf-run/h_bad_metadata.c | 38 -
external/bsd/atf/dist/tests/atf/atf-run/h_fail.cpp | 45 -
external/bsd/atf/dist/tests/atf/atf-run/h_misc.cpp | 307 -
external/bsd/atf/dist/tests/atf/atf-run/h_pass.cpp | 44 -
external/bsd/atf/dist/tests/atf/atf-run/h_several_tcs.c | 68 -
external/bsd/atf/dist/tests/atf/atf-run/h_zero_tcs.c | 35 -
external/bsd/atf/dist/tests/atf/atf-run/t_config.cpp | 103 -
external/bsd/atf/dist/tests/atf/atf-run/t_integration.sh | 968 -
external/bsd/atf/dist/tests/atf/atf-run/t_requirements.cpp | 304 -
external/bsd/atf/dist/tests/atf/atf-run/t_test_program.cpp | 135 -
external/bsd/atf/dist/tests/atf/atf-sh/Atffile | 10 -
external/bsd/atf/dist/tests/atf/atf-sh/h_misc.sh | 278 -
external/bsd/atf/dist/tests/atf/atf-sh/t_atf_check.sh | 187 -
external/bsd/atf/dist/tests/atf/atf-sh/t_config.sh | 90 -
external/bsd/atf/dist/tests/atf/atf-sh/t_integration.sh | 100 -
external/bsd/atf/dist/tests/atf/atf-sh/t_normalize.sh | 50 -
external/bsd/atf/dist/tests/atf/atf-sh/t_tc.sh | 51 -
external/bsd/atf/dist/tests/atf/atf-sh/t_tp.sh | 59 -
external/bsd/atf/dist/tests/atf/formats/Atffile | 6 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_1 | 2 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_1.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_2 | 8 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_2.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_3 | 14 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_3.expout | 11 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_4 | 14 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_4.expout | 11 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_5 | 19 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_5.expout | 17 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_50 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_50.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_51 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_51.experr | 2 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_52 | 19 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_52.experr | 14 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_53 | 9 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_53.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_53.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_54 | 6 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_54.experr | 4 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_6 | 6 -
external/bsd/atf/dist/tests/atf/formats/d_atffile_6.expout | 5 -
external/bsd/atf/dist/tests/atf/formats/d_config_1 | 2 -
external/bsd/atf/dist/tests/atf/formats/d_config_1.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_config_2 | 8 -
external/bsd/atf/dist/tests/atf/formats/d_config_2.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_config_3 | 14 -
external/bsd/atf/dist/tests/atf/formats/d_config_3.expout | 11 -
external/bsd/atf/dist/tests/atf/formats/d_config_4 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_config_4.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_config_50 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_config_50.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_config_51 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_config_51.experr | 2 -
external/bsd/atf/dist/tests/atf/formats/d_config_52 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_config_52.experr | 2 -
external/bsd/atf/dist/tests/atf/formats/d_config_53 | 9 -
external/bsd/atf/dist/tests/atf/formats/d_config_53.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_config_53.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_config_54 | 6 -
external/bsd/atf/dist/tests/atf/formats/d_config_54.experr | 4 -
external/bsd/atf/dist/tests/atf/formats/d_headers_1.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_10 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_10.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_11 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_11.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_12 | 14 -
external/bsd/atf/dist/tests/atf/formats/d_headers_12.experr | 12 -
external/bsd/atf/dist/tests/atf/formats/d_headers_2 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_2.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_3 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_3.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_4 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_4.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_5 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_5.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_6 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_6.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_7 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_7.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_8 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_8.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_9 | 1 -
external/bsd/atf/dist/tests/atf/formats/d_headers_9.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_1 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_1.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_2 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_2.expout | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_3 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_3.expout | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_50 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_50.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_51 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_51.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_52 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_52.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_53 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_53.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_54 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_54.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_60 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_60.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_61 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_61.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_61.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_70 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_70.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_70.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_71 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_71.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_71.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_72 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_72.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_72.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_73 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_73.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_73.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_74 | 5 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_74.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_74.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_75 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_75.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_75.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_76 | 5 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_76.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_76.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_77 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tcr_77.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_1 | 7 -
external/bsd/atf/dist/tests/atf/formats/d_tp_1.expout | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tp_2 | 11 -
external/bsd/atf/dist/tests/atf/formats/d_tp_2.expout | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tp_3 | 10 -
external/bsd/atf/dist/tests/atf/formats/d_tp_3.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tp_4 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tp_4.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tp_50 | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tp_50.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_51 | 5 -
external/bsd/atf/dist/tests/atf/formats/d_tp_51.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_52 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tp_52.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tp_53 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tp_53.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_54 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tp_54.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_55 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tp_55.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_56 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tp_56.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_57 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tp_57.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_58 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tp_58.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tp_59 | 5 -
external/bsd/atf/dist/tests/atf/formats/d_tp_59.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_1 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_1.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tps_2 | 7 -
external/bsd/atf/dist/tests/atf/formats/d_tps_2.expout | 6 -
external/bsd/atf/dist/tests/atf/formats/d_tps_3 | 31 -
external/bsd/atf/dist/tests/atf/formats/d_tps_3.expout | 30 -
external/bsd/atf/dist/tests/atf/formats/d_tps_4 | 37 -
external/bsd/atf/dist/tests/atf/formats/d_tps_4.expout | 36 -
external/bsd/atf/dist/tests/atf/formats/d_tps_5 | 19 -
external/bsd/atf/dist/tests/atf/formats/d_tps_5.expout | 18 -
external/bsd/atf/dist/tests/atf/formats/d_tps_50 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_50.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_51 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_51.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_52 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_52.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_53 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tps_53.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_53.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_54 | 18 -
external/bsd/atf/dist/tests/atf/formats/d_tps_54.experr | 10 -
external/bsd/atf/dist/tests/atf/formats/d_tps_54.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_55 | 20 -
external/bsd/atf/dist/tests/atf/formats/d_tps_55.experr | 10 -
external/bsd/atf/dist/tests/atf/formats/d_tps_55.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/d_tps_56 | 17 -
external/bsd/atf/dist/tests/atf/formats/d_tps_56.experr | 7 -
external/bsd/atf/dist/tests/atf/formats/d_tps_56.expout | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_57 | 5 -
external/bsd/atf/dist/tests/atf/formats/d_tps_57.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_57.expout | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_58 | 7 -
external/bsd/atf/dist/tests/atf/formats/d_tps_58.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_58.expout | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_59 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_59.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_60 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_60.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_61 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_61.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_62 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_62.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_62.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_63 | 3 -
external/bsd/atf/dist/tests/atf/formats/d_tps_63.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_63.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_64 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tps_64.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_64.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_65 | 4 -
external/bsd/atf/dist/tests/atf/formats/d_tps_65.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_65.expout | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_66 | 5 -
external/bsd/atf/dist/tests/atf/formats/d_tps_66.experr | 1 -
external/bsd/atf/dist/tests/atf/formats/d_tps_66.expout | 2 -
external/bsd/atf/dist/tests/atf/formats/h_parser.cpp | 308 -
external/bsd/atf/dist/tests/atf/formats/t_parsers.sh | 223 -
external/bsd/atf/dist/tests/atf/formats/t_writers.cpp | 423 -
external/bsd/atf/dist/tests/atf/test_programs/Atffile | 9 -
external/bsd/atf/dist/tests/atf/test_programs/common.sh | 43 -
external/bsd/atf/dist/tests/atf/test_programs/h_c.c | 391 -
external/bsd/atf/dist/tests/atf/test_programs/h_cpp.cpp | 187 -
external/bsd/atf/dist/tests/atf/test_programs/h_sh.sh | 258 -
external/bsd/atf/dist/tests/atf/test_programs/t_config.sh | 63 -
external/bsd/atf/dist/tests/atf/test_programs/t_fork.sh | 65 -
external/bsd/atf/dist/tests/atf/test_programs/t_meta_data.sh | 66 -
external/bsd/atf/dist/tests/atf/test_programs/t_srcdir.sh | 153 -
external/bsd/atf/dist/tests/atf/test_programs/t_status.sh | 78 -
external/bsd/atf/dist/tests/bootstrap/h_app_empty.cpp | 62 -
external/bsd/atf/dist/tests/bootstrap/h_app_opts_args.cpp | 103 -
external/bsd/atf/dist/tests/bootstrap/h_tp_atf_check_sh.sh | 254 -
external/bsd/atf/dist/tests/bootstrap/h_tp_basic_c.c | 83 -
external/bsd/atf/dist/tests/bootstrap/h_tp_basic_cpp.cpp | 86 -
external/bsd/atf/dist/tests/bootstrap/h_tp_basic_sh.sh | 79 -
external/bsd/atf/dist/tests/bootstrap/h_tp_fail.sh | 47 -
external/bsd/atf/dist/tests/bootstrap/h_tp_pass.sh | 47 -
external/bsd/atf/dist/tests/bootstrap/package.m4 | 6 -
external/bsd/atf/dist/tests/bootstrap/t_application_help.at | 40 -
external/bsd/atf/dist/tests/bootstrap/t_application_opts_args.at | 86 -
external/bsd/atf/dist/tests/bootstrap/t_atf_config.at | 109 -
external/bsd/atf/dist/tests/bootstrap/t_atf_format.at | 170 -
external/bsd/atf/dist/tests/bootstrap/t_atf_run.at | 178 -
external/bsd/atf/dist/tests/bootstrap/t_subr_atf_check.at | 73 -
external/bsd/atf/dist/tests/bootstrap/t_test_program_compare.at | 176 -
external/bsd/atf/dist/tests/bootstrap/t_test_program_filter.at | 71 -
external/bsd/atf/dist/tests/bootstrap/t_test_program_list.at | 63 -
external/bsd/atf/dist/tests/bootstrap/t_test_program_run.at | 51 -
external/bsd/atf/dist/tests/bootstrap/testsuite | 8416 ----------
external/bsd/atf/dist/tests/bootstrap/testsuite.at | 83 -
381 files changed, 1650 insertions(+), 37523 deletions(-)
diffs (truncated from 41437 to 300 lines):
diff -r f991c4129e2d -r 24bcf067a5e2 external/bsd/atf/dist/admin/revision-dist.h
--- a/external/bsd/atf/dist/admin/revision-dist.h Sat Jul 03 08:04:47 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#define PACKAGE_REVISION_BRANCH "org.NetBSD.atf.src"
-#define PACKAGE_REVISION_BASE "65c3f0d1d40edd8b4a80fe9585c009efe1ac07ce"
-#define PACKAGE_REVISION_DATE "2010-06-03"
-#define PACKAGE_REVISION_TIME "10:55:14"
-#define PACKAGE_REVISION_CACHED 1
diff -r f991c4129e2d -r 24bcf067a5e2 external/bsd/atf/dist/atf-c++/atffile.cpp
--- a/external/bsd/atf/dist/atf-c++/atffile.cpp Sat Jul 03 08:04:47 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// Copyright (c) 2007, 2008, 2010 The NetBSD Foundation, Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <fstream>
-
-#include "atf-c++/atffile.hpp"
-#include "atf-c++/exceptions.hpp"
-#include "atf-c++/expand.hpp"
-#include "atf-c++/formats.hpp"
-#include "atf-c++/sanity.hpp"
-
-namespace impl = atf::atffile;
-
-// ------------------------------------------------------------------------
-// The "reader" helper class.
-// ------------------------------------------------------------------------
-
-class reader : public atf::formats::atf_atffile_reader {
- const atf::fs::directory& m_dir;
- atf::tests::vars_map m_conf, m_props;
- std::vector< std::string > m_tps;
-
- void
- got_tp(const std::string& name, bool isglob)
- {
- if (isglob) {
- std::vector< std::string > ms =
- atf::expand::expand_glob(name, m_dir.names());
- // Cannot use m_tps.insert(iterator, begin, end) here because it
- // does not work under Solaris.
- for (std::vector< std::string >::const_iterator iter = ms.begin();
- iter != ms.end(); iter++)
- m_tps.push_back(*iter);
- } else {
- if (m_dir.find(name) == m_dir.end())
- throw atf::not_found_error< atf::fs::path >
- ("Cannot locate the " + name + " file",
- atf::fs::path(name));
- m_tps.push_back(name);
- }
- }
-
- void
- got_prop(const std::string& name, const std::string& val)
- {
- m_props[name] = val;
- }
-
- void
- got_conf(const std::string& var, const std::string& val)
- {
- m_conf[var] = val;
- }
-
-public:
- reader(std::istream& is, const atf::fs::directory& dir) :
- atf::formats::atf_atffile_reader(is),
- m_dir(dir)
- {
- }
-
- const atf::tests::vars_map&
- conf(void)
- const
- {
- return m_conf;
- }
-
- const atf::tests::vars_map&
- props(void)
- const
- {
- return m_props;
- }
-
- const std::vector< std::string >&
- tps(void)
- const
- {
- return m_tps;
- }
-};
-
-// ------------------------------------------------------------------------
-// The "atffile" class.
-// ------------------------------------------------------------------------
-
-impl::atffile::atffile(const atf::tests::vars_map& config_vars,
- const std::vector< std::string >& test_program_names,
- const atf::tests::vars_map& properties) :
- m_conf(config_vars),
- m_tps(test_program_names),
- m_props(properties)
-{
- PRE(properties.find("test-suite") != properties.end());
-}
-
-const std::vector< std::string >&
-impl::atffile::tps(void)
- const
-{
- return m_tps;
-}
-
-const atf::tests::vars_map&
-impl::atffile::conf(void)
- const
-{
- return m_conf;
-}
-
-const atf::tests::vars_map&
-impl::atffile::props(void)
- const
-{
- return m_props;
-}
-
-// ------------------------------------------------------------------------
-// Free functions.
-// ------------------------------------------------------------------------
-
-// XXX Glob expansion and file existance checks certainly do not belong in
-// a *parser*. This needs to be taken out...
-impl::atffile
-impl::read(const atf::fs::path& filename)
-{
- // Scan the directory where the atffile lives in to gather a list of
- // all possible test programs in it.
- fs::directory dir(filename.branch_path());
- dir.erase(filename.leaf_name());
- fs::directory::iterator iter = dir.begin();
- while (iter != dir.end()) {
- const std::string& name = (*iter).first;
- const fs::file_info& fi = (*iter).second;
-
- // Discard hidden files and non-executable ones so that they are
- // not candidates for glob matching.
- if (name[0] == '.' || (!fi.is_owner_executable() &&
- !fi.is_group_executable()))
- dir.erase(iter++);
- else
- iter++;
- }
-
- // Parse the atffile.
- std::ifstream is(filename.c_str());
- if (!is)
- throw atf::not_found_error< fs::path >
- ("Cannot open Atffile", filename);
- reader r(is, dir);
- r.read();
- is.close();
-
- // Sanity checks.
- if (r.props().find("test-suite") == r.props().end())
- throw atf::not_found_error< std::string >
- ("Undefined property `test-suite'", "test-suite");
-
- return atffile(r.conf(), r.tps(), r.props());
-}
diff -r f991c4129e2d -r 24bcf067a5e2 external/bsd/atf/dist/atf-c++/atffile.hpp
--- a/external/bsd/atf/dist/atf-c++/atffile.hpp Sat Jul 03 08:04:47 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// Copyright (c) 2007, 2008, 2010 The NetBSD Foundation, Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-// GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
-#if !defined(_ATF_CXX_ATFFILE_HPP_)
-#define _ATF_CXX_ATFFILE_HPP_
-
-#include <string>
-#include <vector>
-
-#include <atf-c++/fs.hpp>
-#include <atf-c++/tests.hpp>
-
-namespace atf {
-namespace atffile {
-
-// ------------------------------------------------------------------------
-// The "atffile" class.
-// ------------------------------------------------------------------------
-
-class atffile {
- atf::tests::vars_map m_conf;
- std::vector< std::string > m_tps;
- atf::tests::vars_map m_props;
-
-public:
- atffile(const atf::tests::vars_map&,
- const std::vector< std::string >&,
- const atf::tests::vars_map&);
-
- const atf::tests::vars_map& conf(void) const;
- const std::vector< std::string >& tps(void) const;
- const atf::tests::vars_map& props(void) const;
-};
-
-// ------------------------------------------------------------------------
-// Free functions.
-// ------------------------------------------------------------------------
-
-atffile read(const fs::path&);
-
-} // namespace atffile
-} // namespace atf
-
-#endif // !defined(_ATF_CXX_ATFFILE_HPP_)
diff -r f991c4129e2d -r 24bcf067a5e2 external/bsd/atf/dist/atf-c++/formats.cpp
--- a/external/bsd/atf/dist/atf-c++/formats.cpp Sat Jul 03 08:04:47 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1328 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-// CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-// IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
Home |
Main Index |
Thread Index |
Old Index