Index: head/devel/kyua/Makefile =================================================================== --- head/devel/kyua/Makefile (revision 420922) +++ head/devel/kyua/Makefile (revision 420923) @@ -1,58 +1,57 @@ # $FreeBSD$ PORTNAME= kyua -PORTVERSION= 0.11 -PORTREVISION= 1 +PORTVERSION= 0.13 PORTEPOCH= 3 CATEGORIES= devel MASTER_SITES= https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \ LOCAL/jmmv MAINTAINER= jmmv@FreeBSD.org COMMENT= Testing framework for infrastructure software LICENSE= BSD3CLAUSE LIB_DEPENDS= liblutok.so:devel/lutok LIB_DEPENDS+= libsqlite3.so:databases/sqlite3 RUN_DEPENDS:= ${BUILD_DEPENDS} CONFLICTS= kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]* GNU_CONFIGURE= yes -USES= pkgconfig +USES= lua pkgconfig TESTS_USER= tests USERS= ${TESTS_USER} SUB_FILES= kyua.conf SUB_LIST= TESTS_USER=${TESTS_USER} OPTIONS_DEFINE= DOCS EXAMPLES TEST OPTIONS_DEFAULT=TEST OPTIONS_SUB= yes TEST_CONFIGURE_WITH= atf TEST_BUILD_DEPENDS= atf>=0.21:devel/atf TEST_RUN_DEPENDS= atf>=0.21:devel/atf .include CONFIGURE_ARGS+= --without-doxygen CONFIGURE_ARGS+= --docdir=${DOCSDIR} MAKE_FLAGS+= examplesdir=${EXAMPLESDIR} MAKE_FLAGS+= pkgdatadir=${DATADIR} .if ! ${PORT_OPTIONS:MDOCS} MAKE_FLAGS+= doc_DATA= .endif .if ! ${PORT_OPTIONS:MEXAMPLES} MAKE_FLAGS+= dist_examples_DATA= .endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua/ ${INSTALL_DATA} ${WRKDIR}/kyua.conf ${STAGEDIR}${PREFIX}/etc/kyua/ ${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top \ ${STAGEDIR}${PREFIX}/tests/Kyuafile .include Index: head/devel/kyua/distinfo =================================================================== --- head/devel/kyua/distinfo (revision 420922) +++ head/devel/kyua/distinfo (revision 420923) @@ -1,2 +1,3 @@ -SHA256 (kyua-0.11.tar.gz) = 2b8b64a458b642df75086eeb73e8073d105b8d9cff04c9b1a905b68bc8502560 -SIZE (kyua-0.11.tar.gz) = 611865 +TIMESTAMP = 1472222340 +SHA256 (kyua-0.13.tar.gz) = db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6 +SIZE (kyua-0.13.tar.gz) = 663776 Index: head/devel/kyua/files/patch-issue136 =================================================================== --- head/devel/kyua/files/patch-issue136 (revision 420922) +++ head/devel/kyua/files/patch-issue136 (nonexistent) @@ -1,87 +0,0 @@ -diff --git utils/text/operations.cpp utils/text/operations.cpp -index 736e7f3..5a4345d 100644 ---- utils/text/operations.cpp -+++ utils/text/operations.cpp -@@ -38,6 +38,9 @@ namespace text = utils::text; - - /// Replaces XML special characters from an input string. - /// -+/// The list of XML special characters is specified here: -+/// http://www.w3.org/TR/xml11/#charsets -+/// - /// \param in The input to quote. - /// - /// \return A quoted string without any XML special characters. -@@ -46,25 +49,34 @@ text::escape_xml(const std::string& in) - { - std::ostringstream quoted; - -- const char* delims = "\"&<>'"; // Keep in sync with 'switch' below. -- std::string::size_type start_pos = 0; -- std::string::size_type last_pos = in.find_first_of(delims); -- while (last_pos != std::string::npos) { -- quoted << in.substr(start_pos, last_pos - start_pos); -- switch (in[last_pos]) { -- case '"': quoted << """; break; -- case '&': quoted << "&"; break; -- case '<': quoted << "<"; break; -- case '>': quoted << ">"; break; -- case '\'': quoted << "'"; break; -- default: UNREACHABLE; -+ for (std::string::const_iterator it = in.begin(); -+ it != in.end(); ++it) { -+ unsigned char c = (unsigned char)*it; -+ if (c == '"') { -+ quoted << """; -+ } else if (c == '&') { -+ quoted << "&"; -+ } else if (c == '<') { -+ quoted << "<"; -+ } else if (c == '>') { -+ quoted << ">"; -+ } else if (c == '\'') { -+ quoted << "'"; -+ } else if ((c >= 0x01 && c <= 0x08) || -+ (c >= 0x0B && c <= 0x0C) || -+ (c >= 0x0E && c <= 0x1F) || -+ (c >= 0x7F && c <= 0x84) || -+ (c >= 0x86 && c <= 0x9F)) { -+ // for RestrictedChar characters, escape them -+ // as '&#[decimal ASCII value];' -+ // so that in the XML file we will see the escaped -+ // character. -+ quoted << "&#" << static_cast< std::string::size_type >(*it) -+ << ";"; -+ } else { -+ quoted << *it; - } -- start_pos = last_pos + 1; -- last_pos = in.find_first_of(delims, start_pos); - } -- if (start_pos < in.length()) -- quoted << in.substr(start_pos); -- - return quoted.str(); - } - -diff --git utils/text/operations_test.cpp utils/text/operations_test.cpp -index 769b7d4..2d5ab36 100644 ---- utils/text/operations_test.cpp -+++ utils/text/operations_test.cpp -@@ -77,6 +77,7 @@ ATF_TEST_CASE_BODY(escape_xml__no_escaping) - { - ATF_REQUIRE_EQ("a", text::escape_xml("a")); - ATF_REQUIRE_EQ("Some text!", text::escape_xml("Some text!")); -+ ATF_REQUIRE_EQ("\n\t\r", text::escape_xml("\n\t\r")); - } - - -@@ -90,6 +91,8 @@ ATF_TEST_CASE_BODY(escape_xml__some_escaping) - - ATF_REQUIRE_EQ(""&<>'", text::escape_xml("\"&<>'")); - ATF_REQUIRE_EQ("&&&", text::escape_xml("&&&")); -+ ATF_REQUIRE_EQ("&#8;&#11;", text::escape_xml("\b\v")); -+ ATF_REQUIRE_EQ("\t&#127;BAR&", text::escape_xml("\t\x7f""BAR&")); - } - - Property changes on: head/devel/kyua/files/patch-issue136 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kyua/pkg-plist =================================================================== --- head/devel/kyua/pkg-plist (revision 420922) +++ head/devel/kyua/pkg-plist (revision 420923) @@ -1,196 +1,192 @@ bin/kyua etc/kyua/kyua.conf -libexec/kyua-atf-tester -libexec/kyua-plain-tester -libexec/kyua-tap-tester man/man1/kyua-about.1.gz man/man1/kyua-config.1.gz man/man1/kyua-db-exec.1.gz man/man1/kyua-db-migrate.1.gz man/man1/kyua-debug.1.gz man/man1/kyua-help.1.gz man/man1/kyua-list.1.gz man/man1/kyua-report-html.1.gz man/man1/kyua-report-junit.1.gz man/man1/kyua-report.1.gz man/man1/kyua-test.1.gz man/man1/kyua.1.gz man/man5/kyua.conf.5.gz man/man5/kyuafile.5.gz %%DATADIR%%/misc/context.html %%DATADIR%%/misc/index.html %%DATADIR%%/misc/report.css %%DATADIR%%/misc/test_result.html %%DATADIR%%/store/migrate_v1_v2.sql %%DATADIR%%/store/migrate_v2_v3.sql %%DATADIR%%/store/schema_v3.sql %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md +%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/NEWS.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Kyuafile.top %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kyua.conf %%TEST%%tests/Kyuafile %%TEST%%tests/kyua/Kyuafile %%TEST%%tests/kyua/bootstrap/Kyuafile %%TEST%%tests/kyua/bootstrap/atf_helpers %%TEST%%tests/kyua/bootstrap/plain_helpers %%TEST%%tests/kyua/bootstrap/testsuite %%TEST%%tests/kyua/cli/Kyuafile %%TEST%%tests/kyua/cli/cmd_about_test %%TEST%%tests/kyua/cli/cmd_config_test %%TEST%%tests/kyua/cli/cmd_db_exec_test %%TEST%%tests/kyua/cli/cmd_debug_test %%TEST%%tests/kyua/cli/cmd_help_test %%TEST%%tests/kyua/cli/cmd_list_test %%TEST%%tests/kyua/cli/cmd_test_test %%TEST%%tests/kyua/cli/common_test %%TEST%%tests/kyua/cli/config_test %%TEST%%tests/kyua/cli/main_test %%TEST%%tests/kyua/drivers/Kyuafile %%TEST%%tests/kyua/drivers/list_tests_helpers %%TEST%%tests/kyua/drivers/list_tests_test %%TEST%%tests/kyua/drivers/report_junit_test %%TEST%%tests/kyua/drivers/scan_results_test %%TEST%%tests/kyua/engine/Kyuafile +%%TEST%%tests/kyua/engine/atf_helpers +%%TEST%%tests/kyua/engine/atf_list_test +%%TEST%%tests/kyua/engine/atf_result_test +%%TEST%%tests/kyua/engine/atf_test %%TEST%%tests/kyua/engine/config_test %%TEST%%tests/kyua/engine/exceptions_test %%TEST%%tests/kyua/engine/filters_test %%TEST%%tests/kyua/engine/kyuafile_test +%%TEST%%tests/kyua/engine/plain_helpers +%%TEST%%tests/kyua/engine/plain_test +%%TEST%%tests/kyua/engine/scanner_test +%%TEST%%tests/kyua/engine/scheduler_test %%TEST%%tests/kyua/engine/requirements_test -%%TEST%%tests/kyua/engine/runner_test -%%TEST%%tests/kyua/engine/test_case_atf_helpers -%%TEST%%tests/kyua/engine/test_case_plain_helpers -%%TEST%%tests/kyua/engine/testers_test +%%TEST%%tests/kyua/engine/tap_helpers +%%TEST%%tests/kyua/engine/tap_parser_test +%%TEST%%tests/kyua/engine/tap_test %%TEST%%tests/kyua/examples/Kyuafile %%TEST%%tests/kyua/examples/syntax_test %%TEST%%tests/kyua/integration/Kyuafile %%TEST%%tests/kyua/integration/cmd_about_test %%TEST%%tests/kyua/integration/cmd_config_test %%TEST%%tests/kyua/integration/cmd_db_exec_test %%TEST%%tests/kyua/integration/cmd_db_migrate_test %%TEST%%tests/kyua/integration/cmd_debug_test %%TEST%%tests/kyua/integration/cmd_help_test %%TEST%%tests/kyua/integration/cmd_list_test %%TEST%%tests/kyua/integration/cmd_report_html_test %%TEST%%tests/kyua/integration/cmd_report_junit_test %%TEST%%tests/kyua/integration/cmd_report_test %%TEST%%tests/kyua/integration/cmd_test_test %%TEST%%tests/kyua/integration/global_test %%TEST%%tests/kyua/integration/helpers/bad_test_program %%TEST%%tests/kyua/integration/helpers/bogus_test_cases %%TEST%%tests/kyua/integration/helpers/config +%%TEST%%tests/kyua/integration/helpers/dump_env %%TEST%%tests/kyua/integration/helpers/expect_all_pass %%TEST%%tests/kyua/integration/helpers/expect_some_fail %%TEST%%tests/kyua/integration/helpers/interrupts %%TEST%%tests/kyua/integration/helpers/metadata +%%TEST%%tests/kyua/integration/helpers/race %%TEST%%tests/kyua/integration/helpers/simple_all_pass %%TEST%%tests/kyua/integration/helpers/simple_some_fail %%TEST%%tests/kyua/model/Kyuafile %%TEST%%tests/kyua/model/context_test %%TEST%%tests/kyua/model/exceptions_test %%TEST%%tests/kyua/model/metadata_test %%TEST%%tests/kyua/model/test_case_test %%TEST%%tests/kyua/model/test_program_test %%TEST%%tests/kyua/model/test_result_test %%TEST%%tests/kyua/store/Kyuafile %%TEST%%tests/kyua/store/dbtypes_test %%TEST%%tests/kyua/store/exceptions_test %%TEST%%tests/kyua/store/layout_test %%TEST%%tests/kyua/store/metadata_test %%TEST%%tests/kyua/store/migrate_test %%TEST%%tests/kyua/store/read_backend_test %%TEST%%tests/kyua/store/read_transaction_test %%TEST%%tests/kyua/store/schema_inttest %%TEST%%tests/kyua/store/schema_v1.sql %%TEST%%tests/kyua/store/schema_v2.sql %%TEST%%tests/kyua/store/testdata_v1.sql %%TEST%%tests/kyua/store/testdata_v2.sql %%TEST%%tests/kyua/store/testdata_v3_1.sql %%TEST%%tests/kyua/store/testdata_v3_2.sql %%TEST%%tests/kyua/store/testdata_v3_3.sql %%TEST%%tests/kyua/store/testdata_v3_4.sql %%TEST%%tests/kyua/store/transaction_test %%TEST%%tests/kyua/store/write_backend_test %%TEST%%tests/kyua/store/write_transaction_test -%%TEST%%tests/kyua/testers/Kyuafile -%%TEST%%tests/kyua/testers/atf_helpers -%%TEST%%tests/kyua/testers/atf_inttest -%%TEST%%tests/kyua/testers/atf_list_test -%%TEST%%tests/kyua/testers/atf_result_test -%%TEST%%tests/kyua/testers/cli_test -%%TEST%%tests/kyua/testers/env_test -%%TEST%%tests/kyua/testers/error_test -%%TEST%%tests/kyua/testers/fs_test -%%TEST%%tests/kyua/testers/plain_helpers -%%TEST%%tests/kyua/testers/plain_inttest -%%TEST%%tests/kyua/testers/result_test -%%TEST%%tests/kyua/testers/run_test -%%TEST%%tests/kyua/testers/stacktrace_helper -%%TEST%%tests/kyua/testers/stacktrace_test -%%TEST%%tests/kyua/testers/tap_helpers -%%TEST%%tests/kyua/testers/tap_inttest -%%TEST%%tests/kyua/testers/tap_parser_test -%%TEST%%tests/kyua/testers/text_test %%TEST%%tests/kyua/utils/Kyuafile %%TEST%%tests/kyua/utils/auto_array_test %%TEST%%tests/kyua/utils/cmdline/Kyuafile %%TEST%%tests/kyua/utils/cmdline/base_command_test %%TEST%%tests/kyua/utils/cmdline/commands_map_test %%TEST%%tests/kyua/utils/cmdline/exceptions_test %%TEST%%tests/kyua/utils/cmdline/globals_test %%TEST%%tests/kyua/utils/cmdline/options_test %%TEST%%tests/kyua/utils/cmdline/parser_test %%TEST%%tests/kyua/utils/cmdline/ui_test %%TEST%%tests/kyua/utils/config/Kyuafile %%TEST%%tests/kyua/utils/config/exceptions_test %%TEST%%tests/kyua/utils/config/keys_test %%TEST%%tests/kyua/utils/config/lua_module_test %%TEST%%tests/kyua/utils/config/nodes_test %%TEST%%tests/kyua/utils/config/parser_test %%TEST%%tests/kyua/utils/config/tree_test %%TEST%%tests/kyua/utils/datetime_test %%TEST%%tests/kyua/utils/env_test %%TEST%%tests/kyua/utils/format/Kyuafile %%TEST%%tests/kyua/utils/format/containers_test %%TEST%%tests/kyua/utils/format/exceptions_test %%TEST%%tests/kyua/utils/format/formatter_test %%TEST%%tests/kyua/utils/fs/Kyuafile %%TEST%%tests/kyua/utils/fs/auto_cleaners_test +%%TEST%%tests/kyua/utils/fs/directory_test %%TEST%%tests/kyua/utils/fs/exceptions_test %%TEST%%tests/kyua/utils/fs/lua_module_test %%TEST%%tests/kyua/utils/fs/operations_test %%TEST%%tests/kyua/utils/fs/path_test %%TEST%%tests/kyua/utils/logging/Kyuafile %%TEST%%tests/kyua/utils/logging/macros_test %%TEST%%tests/kyua/utils/logging/operations_test %%TEST%%tests/kyua/utils/memory_test %%TEST%%tests/kyua/utils/optional_test %%TEST%%tests/kyua/utils/passwd_test %%TEST%%tests/kyua/utils/process/Kyuafile %%TEST%%tests/kyua/utils/process/child_test +%%TEST%%tests/kyua/utils/process/deadline_killer_test %%TEST%%tests/kyua/utils/process/exceptions_test +%%TEST%%tests/kyua/utils/process/executor_test %%TEST%%tests/kyua/utils/process/fdstream_test %%TEST%%tests/kyua/utils/process/helpers +%%TEST%%tests/kyua/utils/process/isolation_test +%%TEST%%tests/kyua/utils/process/operations_test %%TEST%%tests/kyua/utils/process/status_test %%TEST%%tests/kyua/utils/process/systembuf_test -%%TEST%%tests/kyua/utils/releaser_test %%TEST%%tests/kyua/utils/sanity_test %%TEST%%tests/kyua/utils/signals/Kyuafile %%TEST%%tests/kyua/utils/signals/exceptions_test %%TEST%%tests/kyua/utils/signals/interrupts_test %%TEST%%tests/kyua/utils/signals/misc_test %%TEST%%tests/kyua/utils/signals/programmer_test +%%TEST%%tests/kyua/utils/signals/timer_test %%TEST%%tests/kyua/utils/sqlite/Kyuafile %%TEST%%tests/kyua/utils/sqlite/c_gate_test %%TEST%%tests/kyua/utils/sqlite/database_test %%TEST%%tests/kyua/utils/sqlite/exceptions_test %%TEST%%tests/kyua/utils/sqlite/statement_test %%TEST%%tests/kyua/utils/sqlite/transaction_test +%%TEST%%tests/kyua/utils/stacktrace_helper +%%TEST%%tests/kyua/utils/stacktrace_test %%TEST%%tests/kyua/utils/stream_test %%TEST%%tests/kyua/utils/text/Kyuafile %%TEST%%tests/kyua/utils/text/exceptions_test %%TEST%%tests/kyua/utils/text/operations_test +%%TEST%%tests/kyua/utils/text/regex_test %%TEST%%tests/kyua/utils/text/table_test %%TEST%%tests/kyua/utils/text/templates_test %%TEST%%tests/kyua/utils/units_test