4 files changed, 20 insertions, 95 deletions

diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile
index 219dd4c59882..37fd5e0ee25f 100644
--- a/devel/kyua/Makefile
+++ b/devel/kyua/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kyua
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.11
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
@@ -32,8 +31,8 @@ OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
-TEST_BUILD_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
-TEST_RUN_DEPENDS=	atf>=0.20:${PORTSDIR}/devel/atf
+TEST_BUILD_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
+TEST_RUN_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/kyua/distinfo b/devel/kyua/distinfo
index cf5937e31b9b..f9de2bc26e3b 100644
--- a/devel/kyua/distinfo
+++ b/devel/kyua/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kyua-0.10.tar.gz) = d9497e92d8ff70e6a346c42e9b2c0b66127a418295097d0bcd61721020055783
-SIZE (kyua-0.10.tar.gz) = 596671
+SHA256 (kyua-0.11.tar.gz) = 2b8b64a458b642df75086eeb73e8073d105b8d9cff04c9b1a905b68bc8502560
+SIZE (kyua-0.11.tar.gz) = 611865
diff --git a/devel/kyua/files/patch-tap-parser b/devel/kyua/files/patch-tap-parser
deleted file mode 100644
index 6995499eb00f..000000000000
--- a/devel/kyua/files/patch-tap-parser
+++ /dev/null
@@ -1,67 +0,0 @@
-Pull up upstream d71b7cecae5405c9a7042cd2376bcfd093b283dd to properly parse
-the TAP output of many FreeBSD test programs.
-
---- testers/tap_parser.c
-+++ testers/tap_parser.c
-@@ -302,7 +302,7 @@ kyua_tap_parse(const int fd, FILE* output, kyua_tap_summary_t* summary)
-     }
- 
-     regex_t preg;
--    int code = regcomp(&preg, "^(not )?ok[ \t-]+[0-9]+", REG_EXTENDED);
-+    int code = regcomp(&preg, "^(not )?ok[ \t-]+[0-9]*", REG_EXTENDED);
-     if (code != 0) {
-         error = regex_error_new(code, &preg, "regcomp failed");
-         goto out_input;
-diff --git a/testers/tap_parser_test.c b/testers/tap_parser_test.c
-index a7379d6..c71c5de 100644
---- testers/tap_parser_test.c
-+++ testers/tap_parser_test.c
-@@ -166,7 +166,7 @@ ATF_TC_WITHOUT_HEAD(parse__ok__pass);
- ATF_TC_BODY(parse__ok__pass, tc)
- {
-     const char* contents =
--        "1..7\n"
-+        "1..8\n"
-         "ok - 1\n"
-         "    Some diagnostic message\n"
-         "ok - 2 This test also passed\n"
-@@ -175,13 +175,14 @@ ATF_TC_BODY(parse__ok__pass, tc)
-         "not ok 4 # SKIP Some reason\n"
-         "not ok 5 # TODO Another reason\n"
-         "ok - 6 Doesn't make a difference SKIP\n"
--        "ok - 7 Doesn't make a difference either TODO\n";
-+        "ok - 7 Doesn't make a difference either TODO\n"
-+        "ok # Also works without a number\n";
- 
-     kyua_tap_summary_t summary;
-     kyua_tap_summary_init(&summary);
-     summary.first_index = 1;
--    summary.last_index = 7;
--    summary.ok_count = 7;
-+    summary.last_index = 8;
-+    summary.ok_count = 8;
-     summary.not_ok_count = 0;
- 
-     ok_test(contents, &summary);
-@@ -197,16 +198,17 @@ ATF_TC_BODY(parse__ok__fail, tc)
-         "not ok - 1 This test failed\n"
-         "ok - 2 This test passed\n"
-         "not ok - 3 This test failed\n"
--        "1..5\n"
-+        "1..6\n"
-         "not ok - 4 This test failed\n"
--        "ok - 5 This test passed\n";
-+        "ok - 5 This test passed\n"
-+        "not ok # Fails as well without a number\n";
- 
-     kyua_tap_summary_t summary;
-     kyua_tap_summary_init(&summary);
-     summary.first_index = 1;
--    summary.last_index = 5;
-+    summary.last_index = 6;
-     summary.ok_count = 2;
--    summary.not_ok_count = 3;
-+    summary.not_ok_count = 4;
- 
-     ok_test(contents, &summary);
-     kyua_tap_summary_fini(&summary);
diff --git a/devel/kyua/pkg-plist b/devel/kyua/pkg-plist
index 878596573656..6cc8d6a5ca63 100644
--- a/devel/kyua/pkg-plist
+++ b/devel/kyua/pkg-plist
@@ -4,31 +4,19 @@ libexec/kyua-atf-tester
 libexec/kyua-plain-tester
 libexec/kyua-tap-tester
 man/man1/kyua-about.1.gz
-man/man1/kyua-atf-tester.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-plain-tester.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-tap-tester.1.gz
 man/man1/kyua-test.1.gz
-man/man1/kyua-tester.1.gz
 man/man1/kyua.1.gz
-man/man5/kyua-tester-list.5.gz
-man/man5/kyua-tester-result.5.gz
 man/man5/kyua.conf.5.gz
 man/man5/kyuafile.5.gz
-man/man7/kyua-atf-interface.7.gz
-man/man7/kyua-build-root.7.gz
-man/man7/kyua-plain-interface.7.gz
-man/man7/kyua-results-files.7.gz
-man/man7/kyua-tap-interface.7.gz
-man/man7/kyua-test-filters.7.gz
 %%DATADIR%%/misc/context.html
 %%DATADIR%%/misc/index.html
 %%DATADIR%%/misc/report.css
@@ -59,23 +47,20 @@ man/man7/kyua-test-filters.7.gz
 %%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/config_test
-%%TEST%%tests/kyua/engine/context_test
-%%TEST%%tests/kyua/engine/drivers/Kyuafile
-%%TEST%%tests/kyua/engine/drivers/list_tests_helpers
-%%TEST%%tests/kyua/engine/drivers/list_tests_test
-%%TEST%%tests/kyua/engine/drivers/scan_results_test
 %%TEST%%tests/kyua/engine/exceptions_test
 %%TEST%%tests/kyua/engine/filters_test
 %%TEST%%tests/kyua/engine/kyuafile_test
-%%TEST%%tests/kyua/engine/metadata_test
-%%TEST%%tests/kyua/engine/report_junit_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/test_case_test
-%%TEST%%tests/kyua/engine/test_program_test
-%%TEST%%tests/kyua/engine/test_result_test
 %%TEST%%tests/kyua/engine/testers_test
 %%TEST%%tests/kyua/examples/Kyuafile
 %%TEST%%tests/kyua/examples/syntax_test
@@ -101,6 +86,13 @@ man/man7/kyua-test-filters.7.gz
 %%TEST%%tests/kyua/integration/helpers/metadata
 %%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
@@ -160,6 +152,7 @@ man/man7/kyua-test-filters.7.gz
 %%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