Skip to contentSkip to conversation

tests/test-qga: Reenable guest-agent qtest

PATCH In review Philippe Mathieu-Daudé 3 participants 3 messages Jan 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/test-qga: Reenable guest-agent qtest

Due to a misuse of rules.mak logical functions, commit f386df17448 disabled the guest-agent test.
Enable it back.

---

Quoted 1 line

From rules.mak:

# Logical functions (for operating on y/n values like CONFIG_FOO vars) # Usage: $(call land,$(CONFIG_FOO),$(CONFIG_BAR))

---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +1 -1
index 19b4c0a696..172128b058 100644
@@ -110,7 +110,7 @@ check-unit-y += tests/test-crypto-secret$(EXESUF)
 check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF)
 check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF)
 ifneq (,$(findstring qemu-ga,$(TOOLS)))
-check-unit-$(land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
+check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
 endif
 check-unit-y += tests/test-timed-average$(EXESUF)
 check-unit-y += tests/test-util-sockets$(EXESUF)
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 19 lines · Philippe Mathieu-Daudé

Due to a misuse of rules.mak logical functions, commit f386df17448 disabled the guest-agent test.
Enable it back.

---
From rules.mak:

# Logical functions (for operating on y/n values like CONFIG_FOO vars) # Usage: $(call land,$(CONFIG_FOO),$(CONFIG_BAR))

---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +0 -0
index 19b4c0a696..172128b058 100644

tests/Makefile.include check-unit-y += tests/test-crypto-secret$(EXESUF) · line 116

Quoted 8 lines
tests/Makefile.include +1 -1
@@ -110,7 +110,7 @@ check-unit-y += tests/test-crypto-secret$(EXESUF)
 check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF)
 check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF)
 ifneq (,$(findstring qemu-ga,$(TOOLS)))
-check-unit-$(land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
+check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
 endif
 check-unit-y += tests/test-timed-average$(EXESUF)
 check-unit-y += tests/test-util-sockets$(EXESUF)
Reviewed-by on v1 1/1
#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 20 lines · Philippe Mathieu-Daudé

Due to a misuse of rules.mak logical functions, commit f386df17448 disabled the guest-agent test.
Enable it back.

---
From rules.mak:

# Logical functions (for operating on y/n values like CONFIG_FOO vars) # Usage: $(call land,$(CONFIG_FOO),$(CONFIG_BAR))

---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +0 -0
index 19b4c0a696..172128b058 100644

tests/Makefile.include check-unit-y += tests/test-crypto-secret$(EXESUF) · line 116

Quoted 8 lines
tests/Makefile.include +1 -1
@@ -110,7 +110,7 @@ check-unit-y += tests/test-crypto-secret$(EXESUF)
 check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF)
 check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF)
 ifneq (,$(findstring qemu-ga,$(TOOLS)))
-check-unit-$(land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
+check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF)
 endif
 check-unit-y += tests/test-timed-average$(EXESUF)
 check-unit-y += tests/test-util-sockets$(EXESUF)