diff options
| author | Peter Maydell | 2019-01-14 11:11:36 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-14 11:11:36 +0100 |
| commit | d63a6af935327945eaf687da6119fbabe03be3f9 (patch) | |
| tree | 90e8986219703cb43e64597f8a07632517a0dee7 /tests/Makefile.include | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190111-pull-request' ... (diff) | |
| parent | tests: Disable qht-bench parallel test when using gprof (diff) | |
| download | qemu-d63a6af935327945eaf687da6119fbabe03be3f9.tar.gz qemu-d63a6af935327945eaf687da6119fbabe03be3f9.tar.xz qemu-d63a6af935327945eaf687da6119fbabe03be3f9.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
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.
# gpg: Signature made Fri 11 Jan 2019 18:23:29 GMT
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
tests: Disable qht-bench parallel test when using gprof
configure: Let the TARGET_GPROF var use the regular 'y' for Yes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile.include')
| -rw-r--r-- | tests/Makefile.include | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index f403a6571d..601ef4f64c 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) |