svn commit: r364865 - in head: . devel devel/kyua devel/kyua-atf-compat devel/kyua-cli devel/kyua-testers devel/kyua/files

Julio Merino jmmv at FreeBSD.org
Thu Aug 14 22:01:43 UTC 2014 

Author: jmmv (src committer)
Date: Thu Aug 14 20:21:56 2014
New Revision: 364865
URL: http://svnweb.freebsd.org/changeset/ports/364865
QAT: https://qat.redports.org/buildarchive/r364865/

Log:
  Update kyua to 0.10:
  
  This change merges the kyua-{atf-compat,cli,testers} packages
  into a single devel/kyua package, just as upstream has done, and brings
  Kyua to version 0.10.
  
  The list of changes since kyua-cli 0.9 and kyua-testers 0.3:
  
  Experimental version released on August 14th, 2014.
  
  * Merged 'kyua-cli' and 'kyua-testers' into a single 'kyua' package.
  
  * Dropped the 'kyua-atf-compat' package.
  
  * Issue 100: Do not try to drop privileges to unprivileged_user when we
    are already running as an unprivileged user.  Doing so is not possible
    and thus causes spurious test failures when the current user is not
    root and the current user and unprivileged_user do not match.
  
  * Issue 79: Mention kyua.conf(5) in the "see also" section of kyua(1).
  
  * Issue 75: Change the rewrite__expected_signal__bad_arg test in
    testers/atf_result_test to use a different signal value.  This is to
    prevent triggering a core dump that made the test fail in some platforms.
  
  Reviewed by:	bdrewery (D608)
  Approved by:	bdrewery (ports)

Added:
  head/devel/kyua/distinfo   (contents, props changed)
  head/devel/kyua/files/
  head/devel/kyua/files/kyua.conf.in   (contents, props changed)
Deleted:
  head/devel/kyua-atf-compat/
  head/devel/kyua-cli/
  head/devel/kyua-testers/
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/kyua/Makefile
  head/devel/kyua/pkg-descr
  head/devel/kyua/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Aug 14 20:19:49 2014	(r364864)
+++ head/MOVED	Thu Aug 14 20:21:56 2014	(r364865)
@@ -6407,3 +6407,6 @@ devel/rubygem-foreman_api||2014-08-11|Re
 security/termlog||2014-08-11|Has expired: Fails to build with new utmpx, unstaged, maintainer timeout
 games/linux-americasarmy||2014-08-13|Removed: Unsupported by upstream, distfile unavailable
 net/rsmb|net/mosquitto|2014-08-13|Superseded by net/mosquitto
+devel/kyua-atf-compat|devel/kyua|2014-08-14|Upstream merged all components into devel/kyua
+devel/kyua-cli|devel/kyua|2014-08-14|Upstream merged all components into devel/kyua
+devel/kyua-testers|devel/kyua|2014-08-14|Upstream merged all components into devel/kyua

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Thu Aug 14 20:19:49 2014	(r364864)
+++ head/devel/Makefile	Thu Aug 14 20:21:56 2014	(r364865)
@@ -945,9 +945,6 @@
     SUBDIR += kimwitu
     SUBDIR += kyra
     SUBDIR += kyua
-    SUBDIR += kyua-atf-compat
-    SUBDIR += kyua-cli
-    SUBDIR += kyua-testers
     SUBDIR += lasi
     SUBDIR += lcov
     SUBDIR += leaktracer

Modified: head/devel/kyua/Makefile
==============================================================================
--- head/devel/kyua/Makefile	Thu Aug 14 20:19:49 2014	(r364864)
+++ head/devel/kyua/Makefile	Thu Aug 14 20:21:56 2014	(r364865)
@@ -1,37 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	kyua
-PORTVERSION=	20140215
-PORTEPOCH=	1
+PORTVERSION=	0.10
+PORTEPOCH=	2
 CATEGORIES=	devel
-MASTER_SITES=	# none
-DISTFILES=	# none
-EXTRACT_ONLY=	# none
+MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
+		LOCAL/jmmv
 
 MAINTAINER=	jmmv at FreeBSD.org
-COMMENT=	Kyua (automated testing framework) - Meta-port
+COMMENT=	Testing framework for infrastructure software
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS+=	${LOCALBASE}/bin/atf2kyua:${PORTSDIR}/devel/kyua-atf-compat
-RUN_DEPENDS+=	${LOCALBASE}/bin/kyua:${PORTSDIR}/devel/kyua-cli
-RUN_DEPENDS+=	${LOCALBASE}/libexec/kyua-atf-tester:${PORTSDIR}/devel/kyua-testers
+LIB_DEPENDS=	liblutok.so:${PORTSDIR}/devel/lutok
+LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
-NO_MTREE=	yes
+CONFLICTS=	kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]*
 
-do-install:	# empty
+GNU_CONFIGURE=	yes
+USES=		pkgconfig
 
-pre-everything::
-	@${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port."
-	@${ECHO_MSG} "It won't build and install all the parts until you have typed make install"
+TESTS_USER=	tests
+USERS=		${TESTS_USER}
+SUB_FILES=	kyua.conf
+SUB_LIST=	TESTS_USER=${TESTS_USER}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES TEST
+OPTIONS_DEFAULT=TEST
 
-.if make(package)
-.if !defined(DEPENDS_TARGET:Mpackage) || empty(DEPENDS_TARGET:Mpackage)
-DEPENDS_TARGET="package"
+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
+
+.include <bsd.port.options.mk>
+
+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
 
-.include <bsd.port.post.mk>
+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 <bsd.port.mk>

Added: head/devel/kyua/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/kyua/distinfo	Thu Aug 14 20:21:56 2014	(r364865)
@@ -0,0 +1,2 @@
+SHA256 (kyua-0.10.tar.gz) = d9497e92d8ff70e6a346c42e9b2c0b66127a418295097d0bcd61721020055783
+SIZE (kyua-0.10.tar.gz) = 596671

Added: head/devel/kyua/files/kyua.conf.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/kyua/files/kyua.conf.in	Thu Aug 14 20:21:56 2014	(r364865)
@@ -0,0 +1,14 @@
+-- $FreeBSD$
+--
+-- System-wide configuration file for kyua(1).  See kyua.conf(5) for details
+-- on the syntax.
+--
+
+syntax(2)
+
+-- User to drop privileges to when invoking kyua(1) as root and a test case
+-- requests to be run with non-root permissions.
+unprivileged_user = '%%TESTS_USER%%'
+
+-- An example to set a configuration property specific to FreeBSD.
+--test_suites.FreeBSD.fstype = 'ffs'

Modified: head/devel/kyua/pkg-descr
==============================================================================
--- head/devel/kyua/pkg-descr	Thu Aug 14 20:19:49 2014	(r364864)
+++ head/devel/kyua/pkg-descr	Thu Aug 14 20:21:56 2014	(r364865)
@@ -1,15 +1,18 @@
-Kyua (pronounced Q.A.) is a testing framework for both developers and
-users.  Kyua is different from most other testing frameworks in that it
-puts the end user experience before anything else.  There are multiple
-reasons for users to run the tests themselves, and Kyua ensures that
-they can do so in the most convenient way.
+Kyua is a testing framework for infrastructure software, originally
+designed to equip BSD-based operating systems with a test suite.  This
+means that Kyua is lightweight and simple, and that Kyua integrates well
+with various build systems and continuous integration frameworks.
 
-At the moment, Kyua is focused on implementing a solid foundation and a
-powerful command-line tool to run tests implemented with the Automated
-Testing Framework (ATF).  Later on, Kyua will also provide a set of
-language bindings (C, C++ and shell, at the least) to ease the
-implementation of test cases in a variety of programming languages.
+Kyua features an expressive test suite definition language, a safe
+runtime engine for test suites and a powerful report generation engine.
 
-In effect, Kyua is intended to be a replacement for ATF.
+Kyua is for both developers and users, from the developer applying a
+simple fix to a library to the system administrator deploying a new
+release on a production machine.
 
-WWW: https://code.google.com/p/kyua/
+Kyua is able to execute test programs written with a plethora of testing
+libraries and languages.  The library of choice is ATF, for which Kyua
+was originally designed, but simple, framework-less test programs and
+TAP-compliant test programs can also be executed through Kyua.
+
+WWW: https://github.com/jmmv/kyua/

Modified: head/devel/kyua/pkg-plist
==============================================================================
--- head/devel/kyua/pkg-plist	Thu Aug 14 20:19:49 2014	(r364864)
+++ head/devel/kyua/pkg-plist	Thu Aug 14 20:21:56 2014	(r364865)
@@ -1 +1,229 @@
- at comment This packing list left intentionally empty
+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-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
+%%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%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Kyuafile.top
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kyua.conf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%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/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/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
+%%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/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/simple_all_pass
+%%TEST%%tests/kyua/integration/helpers/simple_some_fail
+%%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/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/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/exceptions_test
+%%TEST%%tests/kyua/utils/process/fdstream_test
+%%TEST%%tests/kyua/utils/process/helpers
+%%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/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/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/table_test
+%%TEST%%tests/kyua/utils/text/templates_test
+%%TEST%%tests/kyua/utils/units_test
+%%TEST%%@dirrm tests/kyua/utils/text
+%%TEST%%@dirrm tests/kyua/utils/sqlite
+%%TEST%%@dirrm tests/kyua/utils/signals
+%%TEST%%@dirrm tests/kyua/utils/process
+%%TEST%%@dirrm tests/kyua/utils/logging
+%%TEST%%@dirrm tests/kyua/utils/fs
+%%TEST%%@dirrm tests/kyua/utils/format
+%%TEST%%@dirrm tests/kyua/utils/config
+%%TEST%%@dirrm tests/kyua/utils/cmdline
+%%TEST%%@dirrm tests/kyua/utils
+%%TEST%%@dirrm tests/kyua/store
+%%TEST%%@dirrm tests/kyua/testers
+%%TEST%%@dirrm tests/kyua/integration/helpers
+%%TEST%%@dirrm tests/kyua/integration
+%%TEST%%@dirrm tests/kyua/examples
+%%TEST%%@dirrm tests/kyua/engine/drivers
+%%TEST%%@dirrm tests/kyua/engine
+%%TEST%%@dirrm tests/kyua/cli
+%%TEST%%@dirrm tests/kyua/bootstrap
+%%TEST%%@dirrm tests/kyua
+ at dirrm %%DATADIR%%/store
+ at dirrm %%DATADIR%%/misc
+ at dirrm %%DATADIR%%
+ at dirrm etc/kyua

More information about the svn-ports-all mailing list