[Qemu-devel] [PULL 0/2] Work around test-qht-par + gprof issues

[Qemu-devel] [PULL 0/2] Work around test-qht-par + gprof issues

[Eduardo Habkost]

The following changes since commit e53f7796fbe71a5c7c24ffebf04b4aa9a759da36:

  Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-01-11 13:35:48 +0000)

are available in the Git repository at:

  git://github.com/ehabkost/qemu.git tags/machine-next-pull-request

for you to fetch changes up to ce2eefd7c21697fee87a0686353de881081d22c6:

  tests: Disable qht-bench parallel test when using gprof (2019-01-11 16:21:45 -0200)

----------------------------------------------------------------
Work around test-qht-par + gprof issues

Travis CI jobs are failing because of test-qht-par when gprof is
enabled.  Temporarily disable test-qht-par if gprof is enabled,
until we fix the bug.

----------------------------------------------------------------

Queue for Machine Core patches


Philippe Mathieu-Daudé (2):
  configure: Let the TARGET_GPROF var use the regular 'y' for Yes
  tests: Disable qht-bench parallel test when using gprof

 configure              | 3 ++-
 tests/Makefile.include | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

-- 
2.18.0.rc1.1.g3f1ff2140

[Qemu-devel] [PULL 1/2] configure: Let the TARGET_GPROF var use the regular 'y' for Yes

[Eduardo Habkost]

From: Philippe Mathieu-Daudé <philmd@redhat.com>

All other variables are set using 'y', which is what the rules.mak
functions expect to parse.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190103150951.17592-2-philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index cf763d4674..0c433ec043 100755
--- a/configure
+++ b/configure
@@ -7490,7 +7490,7 @@ alpha)
 esac
 
 if test "$gprof" = "yes" ; then
-  echo "TARGET_GPROF=yes" >> $config_target_mak
+  echo "TARGET_GPROF=y" >> $config_target_mak
   if test "$target_linux_user" = "yes" ; then
     cflags="-p $cflags"
     ldflags="-p $ldflags"
-- 
2.18.0.rc1.1.g3f1ff2140

[Qemu-devel] [PULL 2/2] tests: Disable qht-bench parallel test when using gprof

[Eduardo Habkost]

From: Philippe Mathieu-Daudé <philmd@redhat.com>

This test is failing on the Travis CI [*] since some time now,
disable it until it get fixed.

[*] https://travis-ci.org/qemu/qemu/builds/474821674

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190103150951.17592-3-philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 configure              | 1 +
 tests/Makefile.include | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 0c433ec043..bb1e7c9e19 100755
--- a/configure
+++ b/configure
@@ -7490,6 +7490,7 @@ alpha)
 esac
 
 if test "$gprof" = "yes" ; then
+  echo "CONFIG_GPROF=y" >> $config_host_mak
   echo "TARGET_GPROF=y" >> $config_target_mak
   if test "$target_linux_user" = "yes" ; then
     cflags="-p $cflags"
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 9c84bbd829..dfd87344bd 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -88,7 +88,8 @@ check-unit-y += tests/test-rcu-simpleq$(EXESUF)
 check-unit-y += tests/test-rcu-tailq$(EXESUF)
 check-unit-y += tests/test-qdist$(EXESUF)
 check-unit-y += tests/test-qht$(EXESUF)
-check-unit-y += tests/test-qht-par$(EXESUF)
+# FIXME: {test-qht-par + gprof} often break on Travis CI
+check-unit-$(call lnot,$(CONFIG_GPROF)) += tests/test-qht-par$(EXESUF)
 check-unit-y += tests/test-bitops$(EXESUF)
 check-unit-y += tests/test-bitcnt$(EXESUF)
 check-unit-y += tests/test-qdev-global-props$(EXESUF)
-- 
2.18.0.rc1.1.g3f1ff2140

Re: [Qemu-devel] [PULL 0/2] Work around test-qht-par + gprof issues

[Peter Maydell]

On Fri, 11 Jan 2019 at 18:25, Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> The following changes since commit e53f7796fbe71a5c7c24ffebf04b4aa9a759da36:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-01-11 13:35:48 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
>
> for you to fetch changes up to ce2eefd7c21697fee87a0686353de881081d22c6:
>
>   tests: Disable qht-bench parallel test when using gprof (2019-01-11 16:21:45 -0200)
>
> ----------------------------------------------------------------
> Work around test-qht-par + gprof issues
>
> Travis CI jobs are failing because of test-qht-par when gprof is
> enabled.  Temporarily disable test-qht-par if gprof is enabled,
> until we fix the bug.
>
> ----------------------------------------------------------------

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.

-- PMM

Re: [Qemu-devel] [PULL 0/2] Work around test-qht-par + gprof issues

[Alex Bennée]

Peter Maydell <peter.maydell@linaro.org> writes:

> On Fri, 11 Jan 2019 at 18:25, Eduardo Habkost <ehabkost@redhat.com> wrote:
>>
>> The following changes since commit e53f7796fbe71a5c7c24ffebf04b4aa9a759da36:
>>
>>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-01-11 13:35:48 +0000)
>>
>> are available in the Git repository at:
>>
>>   git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
>>
>> for you to fetch changes up to ce2eefd7c21697fee87a0686353de881081d22c6:
>>
>>   tests: Disable qht-bench parallel test when using gprof (2019-01-11 16:21:45 -0200)
>>
>> ----------------------------------------------------------------
>> Work around test-qht-par + gprof issues
>>
>> Travis CI jobs are failing because of test-qht-par when gprof is
>> enabled.  Temporarily disable test-qht-par if gprof is enabled,
>> until we fix the bug.

I think we can revert 2/2 now with the usleep changes. I'll include it in
my PR.

--
Alex Bennée