Skip to contentSkip to conversation

buildsys: Disable qht-bench parallel test when using gprof

PATCH Superseded Philippe Mathieu-Daudé 1 participant 4 messages Jan 3, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover buildsys: Disable qht-bench parallel test when using gprof

Disable test-qht-par when using gprof, as this break Travis CI.

See: https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg01638.html

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              | 2 +-
 tests/Makefile.include | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.2
#1 lore raw

PATCH 1/2 configure: Let the TARGET_GPROF var use the regular 'y' for Yes

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

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
index 79375affc1..fa5c079f98 100755
@@ -7470,7 +7470,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"
Signature · 1 line
2.17.2
#2 lore raw

PATCH 2/2 tests: Disable qht-bench parallel test when using gprof

In reply to Philippe Mathieu-Daudé

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

---
 tests/Makefile.include | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tests/Makefile.include +2 -1
index 3f5a1d0c30..e764d8d2cb 100644
@@ -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,$(TARGET_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)
Signature · 1 line
2.17.2
#3 lore raw

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

Quoted 15 lines · Philippe Mathieu-Daudé

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

---
 tests/Makefile.include | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tests/Makefile.include +0 -0
index 3f5a1d0c30..e764d8d2cb 100644

tests/Makefile.include check-unit-y += tests/test-rcu-simpleq$(EXESUF) · line 92

Quoted 6 lines
tests/Makefile.include +2 -1
@@ -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,$(TARGET_GPROF)) += tests/test-qht-par$(EXESUF)

Oops this is incorrect because check-unit isn't target but host, so TARGET_GPROF can't be used.

Quoted 6 lines
tests/Makefile.include +0 -1
 check-unit-y += tests/test-bitops$(EXESUF)
 check-unit-y += tests/test-bitcnt$(EXESUF)
 check-unit-y += tests/test-qdev-global-props$(EXESUF)
--

2.17.2