diff mbox

[1/4] configure: Don't mix glib and libcheck tests

Message ID 1321895345-27959-2-git-send-email-lcapitulino@redhat.com
State New
Headers show

Commit Message

Luiz Capitulino Nov. 21, 2011, 5:09 p.m. UTC
test-coroutine is listed as a libcheck test in the 'checks' variable. This
is not right because 'make check' won't run test-coroutine if libcheck
tests are not enabled (either because libcheck isn't detected or because
--disable-check-utests is passed).

Tests using the glib test framework are independent from libcheck and
afaik are always present (although having a configure switch to disable
them is probably worth it).

Untagle test-coroutine from the libcheck tests by introducing the
'test_progs' variable and using it to generate the test list used by
'make check'.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 configure |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Comments

Andreas Färber Nov. 21, 2011, 6:08 p.m. UTC | #1
Am 21.11.2011 18:09, schrieb Luiz Capitulino:
> test-coroutine is listed as a libcheck test in the 'checks' variable. This
> is not right because 'make check' won't run test-coroutine if libcheck
> tests are not enabled (either because libcheck isn't detected or because
> --disable-check-utests is passed).
> 
> Tests using the glib test framework are independent from libcheck and
> afaik are always present (although having a configure switch to disable
> them is probably worth it).
> 
> Untagle test-coroutine from the libcheck tests by introducing the

Untangle

> 'test_progs' variable and using it to generate the test list used by
> 'make check'.
> 
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

Reviewed-by: Andreas Färber <afaerber@suse.de>

Andreas

> ---
>  configure |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index 6c77fbb..ac0fbd9 100755
> --- a/configure
> +++ b/configure
> @@ -2685,8 +2685,9 @@ if test "$softmmu" = yes ; then
>      fi
>      if [ "$check_utests" = "yes" ]; then
>        checks="check-qint check-qstring check-qdict check-qlist"
> -      checks="check-qfloat check-qjson test-coroutine $checks"
> +      checks="check-qfloat check-qjson $checks"
>      fi
> +    test_progs="$checks test-coroutine"
>    fi
>  fi
>  
> @@ -3175,7 +3176,7 @@ if test "$trace_default" = "yes"; then
>  fi
>  
>  echo "TOOLS=$tools" >> $config_host_mak
> -echo "CHECKS=$checks" >> $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
Paolo Bonzini Nov. 21, 2011, 7:14 p.m. UTC | #2
On 11/21/2011 06:09 PM, Luiz Capitulino wrote:
> test-coroutine is listed as a libcheck test in the 'checks' variable. This
> is not right because 'make check' won't run test-coroutine if libcheck
> tests are not enabled (either because libcheck isn't detected or because
> --disable-check-utests is passed).
>
> Tests using the glib test framework are independent from libcheck and
> afaik are always present (although having a configure switch to disable
> them is probably worth it).
>
> Untagle test-coroutine from the libcheck tests by introducing the
> 'test_progs' variable and using it to generate the test list used by
> 'make check'.
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>

This should be ok for 1.0 too.

Paolo
Luiz Capitulino Nov. 22, 2011, noon UTC | #3
On Mon, 21 Nov 2011 19:08:41 +0100
Andreas Färber <afaerber@suse.de> wrote:

> Am 21.11.2011 18:09, schrieb Luiz Capitulino:
> > test-coroutine is listed as a libcheck test in the 'checks' variable. This
> > is not right because 'make check' won't run test-coroutine if libcheck
> > tests are not enabled (either because libcheck isn't detected or because
> > --disable-check-utests is passed).
> > 
> > Tests using the glib test framework are independent from libcheck and
> > afaik are always present (although having a configure switch to disable
> > them is probably worth it).
> > 
> > Untagle test-coroutine from the libcheck tests by introducing the
> 
> Untangle

Fixed, thanks. This series is going to need a respin anyway.

> 
> > 'test_progs' variable and using it to generate the test list used by
> > 'make check'.
> > 
> > Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> 
> Reviewed-by: Andreas Färber <afaerber@suse.de>
> 
> Andreas
> 
> > ---
> >  configure |    5 +++--
> >  1 files changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/configure b/configure
> > index 6c77fbb..ac0fbd9 100755
> > --- a/configure
> > +++ b/configure
> > @@ -2685,8 +2685,9 @@ if test "$softmmu" = yes ; then
> >      fi
> >      if [ "$check_utests" = "yes" ]; then
> >        checks="check-qint check-qstring check-qdict check-qlist"
> > -      checks="check-qfloat check-qjson test-coroutine $checks"
> > +      checks="check-qfloat check-qjson $checks"
> >      fi
> > +    test_progs="$checks test-coroutine"
> >    fi
> >  fi
> >  
> > @@ -3175,7 +3176,7 @@ if test "$trace_default" = "yes"; then
> >  fi
> >  
> >  echo "TOOLS=$tools" >> $config_host_mak
> > -echo "CHECKS=$checks" >> $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 mbox

Patch

diff --git a/configure b/configure
index 6c77fbb..ac0fbd9 100755
--- a/configure
+++ b/configure
@@ -2685,8 +2685,9 @@  if test "$softmmu" = yes ; then
     fi
     if [ "$check_utests" = "yes" ]; then
       checks="check-qint check-qstring check-qdict check-qlist"
-      checks="check-qfloat check-qjson test-coroutine $checks"
+      checks="check-qfloat check-qjson $checks"
     fi
+    test_progs="$checks test-coroutine"
   fi
 fi
 
@@ -3175,7 +3176,7 @@  if test "$trace_default" = "yes"; then
 fi
 
 echo "TOOLS=$tools" >> $config_host_mak
-echo "CHECKS=$checks" >> $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