kyua testing: remove kyua-{tester,cli,atf-compat} in favor of unified kyua package

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

9 files changed, 85 insertions, 282 deletions

diff --git a/packages/development/development.kconfig b/packages/development/development.kconfig
index 80c1e30..a57e43d 100644
--- a/packages/development/development.kconfig
+++ b/packages/development/development.kconfig
@@ -44,14 +44,8 @@ source packages/development/gtest/gtest.kconfig
 # icu
 source packages/development/icu/icu.kconfig
 
-# kyua-testers
-source packages/development/kyua-testers/kyua-testers.kconfig
-
-# kyua-atf-compat
-source packages/development/kyua-atf-compat/kyua-atf-compat.kconfig
-
-# kyua-cli
-source packages/development/kyua-cli/kyua-cli.kconfig
+# kyua
+source packages/development/kyua/kyua.kconfig
 
 # libbsd
 source packages/development/libbsd/libbsd.kconfig
diff --git a/packages/development/development.mk b/packages/development/development.mk
index 89afb40..2a9d220 100644
--- a/packages/development/development.mk
+++ b/packages/development/development.mk
@@ -47,14 +47,8 @@ $(call embtk_include_pkg,gtest)
 $(call embtk_include_pkg,icu)
 $(call embtk_include_hostpkg,icu_host)
 
-# kyua-testers
-$(call embtk_include_pkg,kyua-testers)
-
-# kyua-atf-compat
-$(call embtk_include_pkg,kyua-atf-compat)
-
-# kyua-cli
-$(call embtk_include_pkg,kyua-cli)
+# kyua
+$(call embtk_include_pkg,kyua)
 
 # libbsd
 $(call embtk_include_pkg,libbsd)
diff --git a/packages/development/kyua-atf-compat/kyua-atf-compat.kconfig b/packages/development/kyua-atf-compat/kyua-atf-compat.kconfig
deleted file mode 100644
index 57db00e..0000000
--- a/packages/development/kyua-atf-compat/kyua-atf-compat.kconfig
+++ /dev/null
@@ -1,52 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2014 Abdoulaye Walsimou GAYE.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-#
-# \file         kyua-atf-compat.kconfig
-# \brief	kyua-atf-compat.kconfig of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         July 2014
-################################################################################
-
-config EMBTK_HAVE_KYUA-ATF-COMPAT
-	bool "Have kyua-atf-compat"
-	select EMBTK_HAVE_KYUA-TESTERS
-	help
-	 kyua-atf-compat, provides tools to ease the transition from ATF to Kyua.
-	 In particular, this includes is a tool to convert Atffile files to
-	 Kyuafile files in an automated manner, and drop-in replacement wrappers
-	 for atf-run and atf-report.
-
-choice
-	prompt "kyua-atf-compat version you wish"
-	depends on EMBTK_HAVE_KYUA-ATF-COMPAT
-	help
-	 Here you can choose which version of kyua-atf-compat you want to use.
-
-	config  EMBTK_KYUA-ATF-COMPAT_VERSION_0_2
-		bool "kyua-atf-compat-0.2"
-endchoice
-
-config EMBTK_KYUA-ATF-COMPAT_VERSION_STRING
-	string
-	default "0.2"	if EMBTK_KYUA-ATF-COMPAT_VERSION_0_2
-
-config EMBTK_KYUA-ATF-COMPAT_NEED_PATCH
-	bool
-config EMBTK_KYUA-ATF-COMPAT_NEED_AUTORECONF
-	bool
diff --git a/packages/development/kyua-atf-compat/kyua-atf-compat.mk b/packages/development/kyua-atf-compat/kyua-atf-compat.mk
deleted file mode 100644
index fea590b..0000000
--- a/packages/development/kyua-atf-compat/kyua-atf-compat.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-#
-# \file         kyua-atf-compat.mk
-# \brief	kyua-atf-compat.mk of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         July 2014
-################################################################################
-
-KYUA-ATF-COMPAT_NAME		:= kyua-atf-compat
-KYUA-ATF-COMPAT_VERSION		:= $(call embtk_get_pkgversion,kyua-atf-compat)
-KYUA-ATF-COMPAT_SITE		:= https://github.com/jmmv/kyua/releases/download/kyua-atf-compat-$(KYUA-ATF-COMPAT_VERSION)
-KYUA-ATF-COMPAT_PACKAGE		:= kyua-atf-compat-$(KYUA-ATF-COMPAT_VERSION).tar.gz
-KYUA-ATF-COMPAT_SRC_DIR		:= $(embtk_pkgb)/kyua-atf-compat-$(KYUA-ATF-COMPAT_VERSION)
-KYUA-ATF-COMPAT_BUILD_DIR	:= $(embtk_pkgb)/kyua-atf-compat-$(KYUA-ATF-COMPAT_VERSION)-build
-
-KYUA-ATF-COMPAT_BINS		:= atf2kyua atf-report atf-run
-KYUA-ATF-COMPAT_SHARES		:= doc/kyua-atf-compat kyua-atf-compat
-KYUA-ATF-COMPAT_SHARES		+= man/man1/atf2kyua.1
-
-KYUA-ATF-COMPAT_CONFIGURE_OPTS	:= --with-atf=no
-
-KYUA-ATF-COMPAT_DEPS		:= kyua-testers_install
diff --git a/packages/development/kyua-cli/kyua-cli.mk b/packages/development/kyua-cli/kyua-cli.mk
deleted file mode 100644
index 31c4c76..0000000
--- a/packages/development/kyua-cli/kyua-cli.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2014 Abdoulaye Walsimou GAYE.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-#
-# \file         kyua-cli.mk
-# \brief	kyua-cli.mk of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         July 2014
-################################################################################
-
-KYUA-CLI_NAME		:= kyua-cli
-KYUA-CLI_VERSION	:= $(call embtk_get_pkgversion,kyua-cli)
-KYUA-CLI_SITE		:= https://github.com/jmmv/kyua/releases/download/kyua-cli-$(KYUA-CLI_VERSION)
-KYUA-CLI_PACKAGE	:= kyua-cli-$(KYUA-CLI_VERSION).tar.gz
-KYUA-CLI_SRC_DIR	:= $(embtk_pkgb)/kyua-cli-$(KYUA-CLI_VERSION)
-KYUA-CLI_BUILD_DIR	:= $(embtk_pkgb)/kyua-cli-$(KYUA-CLI_VERSION)-build
-
-KYUA-CLI_BINS		:= kyua
-KYUA-CLI_SHARES		:= doc/kyua-cli kyua-cli
-
-KYUA-CLI_CONFIGURE_ENV	:= kyua_cv_attribute_noreturn=yes
-KYUA-CLI_CONFIGURE_ENV	+= kyua_cv_getopt_optind_reset_value=1
-KYUA-CLI_CONFIGURE_ENV	+= kyua_cv_signals_lastno=_NSIG
-KYUA-CLI_CONFIGURE_ENV	+= kyua_cv_getcwd_works=yes
-KYUA-CLI_CONFIGURE_ENV	+= kyua_cv_getcwd_null_0_works=yes
-
-KYUA-CLI_CONFIGURE_OPTS	:= --with-atf=no --with-doxygen=no
-
-KYUA-CLI_DEPS		:= lutok_install kyua-testers_install
-KYUA-CLI_DEPS		+= sqlite_install
-
-pembtk_kyua-cli_shared	:= misc store
-define embtk_postinstall_kyua-cli
-	rm -rf $(embtk_rootfs)/usr/share/kyua-cli
-	install -d $(embtk_rootfs)/usr/share/kyua-cli
-	for s in $(pembtk_kyua-cli_shared); do					\
-		cp -R $(embtk_sysroot)/usr/share/kyua-cli/$$s			\
-			$(embtk_rootfs)/usr/share/kyua-cli/$$s;			\
-	done
-endef
diff --git a/packages/development/kyua-testers/kyua-testers.kconfig b/packages/development/kyua-testers/kyua-testers.kconfig
deleted file mode 100644
index 2abd259..0000000
--- a/packages/development/kyua-testers/kyua-testers.kconfig
+++ /dev/null
@@ -1,52 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2014 Abdoulaye Walsimou GAYE.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-#
-# \file         kyua-testers.kconfig
-# \brief	kyua-testers.kconfig of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         July 2014
-################################################################################
-
-config EMBTK_HAVE_KYUA-TESTERS
-	bool "Have kyua-testers"
-	select EMBTK_HAVE_ATF
-	help
-	 Kyua (automated testing framework) - Testers
-	 see https://github.com/jmmv/kyua
-
-choice
-	prompt "kyua-testers version you wish"
-	depends on EMBTK_HAVE_KYUA-TESTERS
-	help
-	 Here you can choose which version of kyua-testers you want to use.
-
-	config  EMBTK_KYUA-TESTERS_VERSION_0_2
-		bool "kyua-testers-0.2"
-		select EMBTK_KYUA-TESTERS_NEED_AUTORECONF
-		select EMBTK_KYUA-TESTERS_NEED_PATCH
-endchoice
-
-config EMBTK_KYUA-TESTERS_VERSION_STRING
-	string
-	default "0.2"		if EMBTK_KYUA-TESTERS_VERSION_0_2
-
-config EMBTK_KYUA-TESTERS_NEED_PATCH
-	bool
-config EMBTK_KYUA-TESTERS_NEED_AUTORECONF
-	bool
diff --git a/packages/development/kyua-testers/kyua-testers.mk b/packages/development/kyua-testers/kyua-testers.mk
deleted file mode 100644
index 92636de..0000000
--- a/packages/development/kyua-testers/kyua-testers.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2014 Abdoulaye Walsimou GAYE.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-#
-# \file         kyua-testers.mk
-# \brief	kyua-testers.mk of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         July 2014
-################################################################################
-
-KYUA-TESTERS_NAME	:= kyua-testers
-KYUA-TESTERS_VERSION	:= $(call embtk_get_pkgversion,kyua-testers)
-KYUA-TESTERS_SITE	:= https://github.com/jmmv/kyua/releases/download/kyua-testers-$(KYUA-TESTERS_VERSION)
-KYUA-TESTERS_PACKAGE	:= kyua-testers-$(KYUA-TESTERS_VERSION).tar.gz
-KYUA-TESTERS_SRC_DIR	:= $(embtk_pkgb)/kyua-testers-$(KYUA-TESTERS_VERSION)
-KYUA-TESTERS_BUILD_DIR	:= $(embtk_pkgb)/kyua-testers-$(KYUA-TESTERS_VERSION)-build
-
-KYUA-TESTERS_LIBEXECS		:= kyua-atf-tester kyua-plain-tester
-KYUA-TESTERS_LIBEXECS		+= kyua-tap-tester
-KYUA-TESTERS_PKGCONFIGS		:= kyua-testers.pc
-KYUA-TESTERS_SHARES		:= doc/kyua-testers
-KYUA-TESTERS_SHARES		+= man/man*/kyua-*
-
-KYUA-TESTERS_CONFIGURE_ENV	:= kyua_cv_getopt_plus=no
-KYUA-TESTERS_CONFIGURE_ENV	+= kyua_cv_attribute_noreturn=yes
-KYUA-TESTERS_CONFIGURE_ENV	+= kyua_cv_lchmod_works=no
-KYUA-TESTERS_CONFIGURE_ENV	+= kyua_cv_getopt_gnu=no
-KYUA-TESTERS_CONFIGURE_ENV	+= kyua_cv_getopt_optind_reset_value=1
-KYUA-TESTERS_CONFIGURE_ENV	+= kyua_cv_signals_lastno=_NSIG
-KYUA-TESTERS_CONFIGURE_ENV	+= kyua_cv_getcwd_null_0_works=yes
-
-KYUA-TESTERS_CONFIGURE_OPTS	:= --with-atf=no --with-doxygen=no
-
-KYUA-TESTERS_DEPS		:= atf_install
diff --git a/packages/development/kyua-cli/kyua-cli.kconfig b/packages/development/kyua/kyua.kconfig
index 15cb896..b6b7650 100644
--- a/packages/development/kyua-cli/kyua-cli.kconfig
+++ b/packages/development/kyua/kyua.kconfig
@@ -17,39 +17,43 @@
 #
 ################################################################################
 #
-# \file         kyua-cli.kconfig
-# \brief	kyua-cli.kconfig of Embtoolkit
+# \file         kyua.kconfig
+# \brief	kyua.kconfig of Embtoolkit
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         July 2014
 ################################################################################
 
-config EMBTK_HAVE_KYUA-CLI
-	bool "Have kyua-cli"
-	select EMBTK_HAVE_KYUA-TESTERS
+config EMBTK_HAVE_KYUA
+	bool "Have kyua"
+	select EMBTK_HAVE_ATF
 	select EMBTK_HAVE_LUTOK
 	select EMBTK_HAVE_SQLITE
 	help
-	 kyua-cli provides the command-line interface to the Kyua runtime system.
-	 The major purpose of this tool is to run test cases and generate
-	 unified reports for their results.
+	 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.
+	 Kyua features an expressive test suite definition language, a safe
+	 runtime engine for test suites and a powerful report generation engine.
 
 choice
-	prompt "kyua-cli version you wish"
-	depends on EMBTK_HAVE_KYUA-CLI
+	prompt "kyua version you wish"
+	depends on EMBTK_HAVE_KYUA
 	help
-	 Here you can choose which version of kyua-cli you want to use.
+	 Here you can choose which version of kyua you want to use.
 
-	config  EMBTK_KYUA-CLI_VERSION_0_8
-		bool "kyua-cli-0.8"
-		select EMBTK_KYUA-CLI_NEED_PATCH
-		select EMBTK_KYUA-CLI_NEED_AUTORECONF
+	config  EMBTK_KYUA_VERSION_0_10
+		bool "kyua-0.10"
+		select EMBTK_KYUA_NEED_AUTORECONF
+		select EMBTK_KYUA_NEED_PATCH
 endchoice
 
-config EMBTK_KYUA-CLI_VERSION_STRING
+config EMBTK_KYUA_VERSION_STRING
 	string
-	default "0.8"	if EMBTK_KYUA-CLI_VERSION_0_8
+	default "0.10"		if EMBTK_KYUA_VERSION_0_10
 
-config EMBTK_KYUA-CLI_NEED_PATCH
+config EMBTK_KYUA_NEED_PATCH
 	bool
-config EMBTK_KYUA-CLI_NEED_AUTORECONF
+config EMBTK_KYUA_NEED_AUTORECONF
 	bool
diff --git a/packages/development/kyua/kyua.mk b/packages/development/kyua/kyua.mk
new file mode 100644
index 0000000..c5ecc32
--- /dev/null
+++ b/packages/development/kyua/kyua.mk
@@ -0,0 +1,58 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2014 Abdoulaye Walsimou GAYE.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         kyua.mk
+# \brief	kyua.mk of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         July 2014
+################################################################################
+
+KYUA_NAME	:= kyua
+KYUA_VERSION	:= $(call embtk_get_pkgversion,kyua)
+KYUA_SITE	:= https://github.com/jmmv/kyua/releases/download/kyua-$(KYUA_VERSION)
+KYUA_PACKAGE	:= kyua-$(KYUA_VERSION).tar.gz
+KYUA_SRC_DIR	:= $(embtk_pkgb)/kyua-$(KYUA_VERSION)
+KYUA_BUILD_DIR	:= $(embtk_pkgb)/kyua-$(KYUA_VERSION)-build
+
+KYUA_BINS		:= kyua
+KYUA_SHARES		:= doc/kyua kyua man/man*/kyua*
+KYUA_LIBEXECS		:= kyua-atf-tester kyua-plain-tester kyua-tap-tester
+
+KYUA_CONFIGURE_ENV	:= kyua_cv_attribute_noreturn=yes
+KYUA_CONFIGURE_ENV	+= kyua_cv_getopt_plus=no
+KYUA_CONFIGURE_ENV	+= kyua_cv_getopt_optind_reset_value=1
+KYUA_CONFIGURE_ENV	+= kyua_cv_getopt_gnu=yes
+KYUA_CONFIGURE_ENV	+= kyua_cv_lchmod_works=no
+KYUA_CONFIGURE_ENV	+= kyua_cv_signals_lastno=_NSIG
+KYUA_CONFIGURE_ENV	+= kyua_cv_getcwd_works=yes
+KYUA_CONFIGURE_ENV	+= kyua_cv_getcwd_null_0_works=yes
+
+KYUA_CONFIGURE_OPTS	:= --with-atf=no --with-doxygen=no
+
+KYUA_DEPS		:= atf_install lutok_install sqlite_install
+
+pembtk_kyua_shared	:= misc store
+define embtk_postinstall_kyua
+	rm -rf $(embtk_rootfs)/usr/share/kyua
+	install -d $(embtk_rootfs)/usr/share/kyua
+	for s in $(pembtk_kyua_shared); do					\
+		cp -R $(embtk_sysroot)/usr/share/kyua/$$s			\
+			$(embtk_rootfs)/usr/share/kyua/$$s;			\
+	done
+endef