From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgLxx-00048L-Si for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:07:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgLxt-000420-SV for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:07:21 -0400 Received: from [199.232.76.173] (port=45835 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgLxt-00041I-Ge for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:07:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65212) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgLxs-0000sP-SY for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:07:17 -0400 From: Luiz Capitulino Date: Wed, 26 Aug 2009 14:05:48 -0300 Message-Id: <1251306352-31316-26-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1251306352-31316-1-git-send-email-lcapitulino@redhat.com> References: <1251306352-31316-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 25/29] Add check support List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, avi@redhat.com Check is a unit testing framework for C. All the QObjects have unit-tests and more will be written for the future 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 bdb6b39..efeb6ba 100644 --- a/Makefile +++ b/Makefile @@ -180,6 +180,10 @@ qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) 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 5c1065f..18cb586 100755 --- a/configure +++ b/configure @@ -196,6 +196,7 @@ build_docs="yes" uname_release="" curses="yes" curl="yes" +check="no" io_thread="no" nptl="yes" mixemu="no" @@ -482,6 +483,8 @@ for opt do ;; --disable-curl) curl="no" ;; + --enable-check) check="yes" + ;; --disable-nptl) nptl="no" ;; --enable-mixemu) mixemu="yes" @@ -600,6 +603,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" @@ -1089,6 +1093,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" @@ -1486,6 +1509,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" @@ -1672,6 +1696,11 @@ if test "$curl" = "yes" ; then echo "CONFIG_CURL=y" >> $config_host_mak echo "CURL_CFLAGS=$curl_cflags" >> $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 fi @@ -1723,6 +1752,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 -- 1.6.4.1.184.g2e117