From patchwork Mon Jan 9 15:56:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 135061 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 97459B6FA9 for ; Tue, 10 Jan 2012 03:00:52 +1100 (EST) Received: from localhost ([::1]:59387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkHeU-0006kx-1P for incoming@patchwork.ozlabs.org; Mon, 09 Jan 2012 11:00:50 -0500 Received: from eggs.gnu.org ([140.186.70.92]:39614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkHe4-0006SA-PS for qemu-devel@nongnu.org; Mon, 09 Jan 2012 11:00:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RkHdu-00029j-Rs for qemu-devel@nongnu.org; Mon, 09 Jan 2012 11:00:24 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:45750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkHdu-00029c-Ko for qemu-devel@nongnu.org; Mon, 09 Jan 2012 11:00:14 -0500 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 9 Jan 2012 11:00:13 -0500 Received: from d01relay01.pok.ibm.com (9.56.227.233) by e6.ny.us.ibm.com (192.168.1.106) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 9 Jan 2012 10:56:50 -0500 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q09FugjT211700 for ; Mon, 9 Jan 2012 10:56:42 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q09Fudhm009536 for ; Mon, 9 Jan 2012 13:56:39 -0200 Received: from titi.austin.rr.com (sig-9-65-217-92.mts.ibm.com [9.65.217.92]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q09FuDUp007421; Mon, 9 Jan 2012 13:56:35 -0200 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 9 Jan 2012 09:56:11 -0600 Message-Id: <1326124572-8312-10-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1326124572-8312-1-git-send-email-aliguori@us.ibm.com> References: <1326124572-8312-1-git-send-email-aliguori@us.ibm.com> x-cbid: 12010915-1976-0000-0000-000009507FAA X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.146 Cc: Anthony Liguori , Luiz Capitulino Subject: [Qemu-devel] [PATCH 10/11] test: eliminate libcheck tests and have make check use gtester X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Anthony Liguori --- configure | 33 +-------------------------------- tests/Makefile | 11 ++++++----- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/configure b/configure index b2e622c..90ad82c 100755 --- a/configure +++ b/configure @@ -176,7 +176,6 @@ mixemu="no" aix="no" blobs="yes" pkgversion="" -check_utests="" pie="" zero_malloc="" trace_backend="nop" @@ -733,10 +732,6 @@ for opt do ;; --enable-fdt) fdt="yes" ;; - --disable-check-utests) check_utests="no" - ;; - --enable-check-utests) check_utests="yes" - ;; --disable-nptl) nptl="no" ;; --enable-nptl) nptl="yes" @@ -1014,8 +1009,6 @@ echo " --disable-curl disable curl connectivity" echo " --enable-curl enable curl connectivity" echo " --disable-fdt disable fdt device tree" echo " --enable-fdt enable fdt device tree" -echo " --disable-check-utests disable check unit-tests" -echo " --enable-check-utests enable check unit-tests" echo " --disable-bluez disable bluez stack connectivity" echo " --enable-bluez enable bluez stack connectivity" echo " --disable-slirp disable SLIRP userspace network connectivity" @@ -1923,26 +1916,6 @@ EOF fi # test "$curl" ########################################## -# check framework probe - -if test "$check_utests" != "no" ; then - cat > $TMPC << EOF -#include -int main(void) { suite_create("qemu test"); return 0; } -EOF - check_libs=`$pkg_config --libs check 2>/dev/null` - if compile_prog "" $check_libs ; then - check_utests=yes - libs_tools="$check_libs $libs_tools" - else - if test "$check_utests" = "yes" ; then - feature_not_found "check" - fi - check_utests=no - fi -fi # test "$check_utests" - -########################################## # bluez support probe if test "$bluez" != "no" ; then cat > $TMPC << EOF @@ -2799,10 +2772,7 @@ if test "$softmmu" = yes ; then if [ "$guest_agent" = "yes" ]; then tools="qemu-ga\$(EXESUF) $tools" fi - if [ "$check_utests" = "yes" ]; then - checks="$checks" - fi - test_progs="$checks check-qdict check-qfloat check-qint check-qstring check-qlist check-qjson test-coroutine test-qmp-output-visitor test-qmp-input-visitor" + test_progs="check-qdict check-qfloat check-qint check-qstring check-qlist check-qjson test-coroutine test-qmp-output-visitor test-qmp-input-visitor" fi fi @@ -3274,7 +3244,6 @@ if test "$trace_default" = "yes"; then fi echo "TOOLS=$tools" >> $config_host_mak -echo "CHECKS=$test_progs" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak echo "INSTALL=$install" >> $config_host_mak diff --git a/tests/Makefile b/tests/Makefile index cff9ff3..cba482f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,7 @@ +CHECKS=check-qdict check-qfloat check-qint check-qstring check-qlist +CHECKS+=check-qjson test-coroutine test-qmp-output-visitor +CHECKS+=test-qmp-input-visitor + check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS) check-qint: check-qint.o qint.o $(tools-obj-y) @@ -30,8 +34,5 @@ test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o .PHONY: check -check: $(patsubst %,run-check-%,$(CHECKS)) - -run-check-%: % - ./$< - +check: $(CHECKS) + gtester $(CHECKS)