diff options
| author | Peter Maydell | 2019-10-31 11:07:54 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-10-31 11:07:54 +0100 |
| commit | 741a90038bef13d64e051fb35c4e894ab16d1554 (patch) | |
| tree | 476985bd02a0c516777d2791a178f9dabf500df5 /tests/Makefile.include | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-sfp-20191030' into staging (diff) | |
| parent | Acceptance test: update kernel for m68k/q800 test (diff) | |
| download | qemu-741a90038bef13d64e051fb35c4e894ab16d1554.tar.gz qemu-741a90038bef13d64e051fb35c4e894ab16d1554.tar.xz qemu-741a90038bef13d64e051fb35c4e894ab16d1554.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-311019-1' into staging
Fixes to get CI green again
- fix m68k acceptance tests (Cleber)
- stop build breakage (Daniel)
# gpg: Signature made Thu 31 Oct 2019 10:00:53 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-next-311019-1:
Acceptance test: update kernel for m68k/q800 test
Acceptance test: cancel test if m68k kernel packages goes missing
tests: fix conditional for disabling XTS test
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile.include')
| -rw-r--r-- | tests/Makefile.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index c79402ab75..7715d8cd63 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -140,7 +140,7 @@ check-unit-y += tests/test-base64$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT))) += tests/test-crypto-pbkdf$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-ivgen$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-afsplit$(EXESUF) -check-unit-$(if $(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test-crypto-xts$(EXESUF) +check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test-crypto-xts$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-block$(EXESUF) check-unit-y += tests/test-logging$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_REPLICATION)) += tests/test-replication$(EXESUF) |