From patchwork Mon Aug 3 16:57:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 30676 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 38786B6F2B for ; Tue, 4 Aug 2009 06:06:45 +1000 (EST) Received: from localhost ([127.0.0.1]:40822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY3ns-0007xP-Kv for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 16:06:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MY0sO-0006Ly-Eh for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:59:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MY0sM-0006Ko-0n for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:59:07 -0400 Received: from [199.232.76.173] (port=55301 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY0sL-0006Kd-Qp for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:59:05 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56393) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MY0sL-0003En-7R for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:59:05 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73Gx40L026412; Mon, 3 Aug 2009 12:59:04 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73Gx3eC015493; Mon, 3 Aug 2009 12:59:03 -0400 Received: from localhost (vpn-10-1.bos.redhat.com [10.16.10.1]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Gx20H030191; Mon, 3 Aug 2009 12:59:02 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 13:57:20 -0300 Message-Id: <1249318642-19324-24-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> References: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 23/25] Add check support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Check is a unit testing framework for C. New monitor code and QDict have unit-tests written with it and more unit-tests will be written for the next high level data types. More info about check can be found at: http://check.sourceforge.net/ Signed-off-by: Luiz Capitulino --- Makefile | 4 ++++ configure | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 41c669f..a929d2c 100644 --- a/Makefile +++ b/Makefile @@ -221,6 +221,10 @@ qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") +ifdef CONFIG_CHECK +LIBS += $(CHECK_LIBS) +endif + clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h diff --git a/configure b/configure index 36db3b2..95e5afc 100755 --- a/configure +++ b/configure @@ -190,6 +190,7 @@ build_docs="yes" uname_release="" curses="yes" curl="yes" +check="no" pthread="yes" aio="yes" io_thread="no" @@ -503,6 +504,8 @@ for opt do ;; --disable-curl) curl="no" ;; + --enable-check) check="yes" + ;; --disable-nptl) nptl="no" ;; --enable-mixemu) mixemu="yes" @@ -651,6 +654,7 @@ echo " --disable-vnc-tls disable TLS encryption for VNC server" echo " --disable-vnc-sasl disable SASL encryption for VNC server" echo " --disable-curses disable curses output" echo " --disable-curl disable curl connectivity" +echo " --enable-check enable check unit-tests" echo " --disable-bluez disable bluez stack connectivity" echo " --disable-kvm disable KVM acceleration support" echo " --disable-nptl disable usermode NPTL support" @@ -1132,6 +1136,25 @@ EOF fi # test "$curl" ########################################## +# check probe + +if test "$check" = "yes" ; then + `pkg-config --libs check > /dev/null 2> /dev/null` || check="no" +fi + +if test "$check" = "yes" ; then + check="no" + cat > $TMPC << EOF +#include +int main(void) { suite_create("yeah"); return 0; } +EOF + check_libs=`pkg-config --libs check` + if $cc ${ARCH_CFLAGS} $check_libs -o $TMPE $TMPC > /dev/null 2> /dev/null ; then + check="yes" + fi +fi # test "$check" + +########################################## # bluez support probe if test "$bluez" = "yes" ; then `pkg-config bluez 2> /dev/null` || bluez="no" @@ -1438,6 +1461,7 @@ fi echo "SDL support $sdl" echo "curses support $curses" echo "curl support $curl" +echo "check support $check" echo "mingw32 support $mingw32" echo "Audio drivers $audio_drv_list" echo "Extra audio cards $audio_card_list" @@ -1646,6 +1670,11 @@ if test "$curl" = "yes" ; then echo "CONFIG_CURL=y" >> $config_host_mak echo "CURL_LIBS=$curl_libs" >> $config_host_mak fi +if test "$check" = "yes" ; then + echo "CONFIG_CHECK=y" >> $config_host_mak + echo "CHECK_LIBS=$check_libs" >> $config_host_mak + echo "#define CONFIG_CHECK 1" >> $config_host_h +fi if test "$brlapi" = "yes" ; then echo "CONFIG_BRLAPI=y" >> $config_host_mak echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak @@ -1735,6 +1764,9 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then tools="qemu-img\$(EXESUF) $tools" if [ "$linux" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools" + if [ "$check" = "yes" ]; then + tools="$tools" + fi fi fi echo "TOOLS=$tools" >> $config_host_mak