semihosting: move semihosting tests to multiarch

[mirror_qemu.git] / tests / tcg / Makefile.target

diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index 3c7421a356e55d57df19eaaf3ca8b8f667515a06..cab8c6b3a2dab4f88deac8f5de77be6dce8b3474 100644 (file)
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -32,6 +32,9 @@
 all:
 -include ../../../config-host.mak
 -include ../config-$(TARGET).mak
+ifeq ($(CONFIG_USER_ONLY),y)
+-include $(SRC_PATH)/default-configs/targets/$(TARGET).mak
+endif
 
 # for including , in command strings
 COMMA := ,
@@ -79,7 +82,7 @@ QEMU_OPTS=
 
 # If TCG debugging is enabled things are a lot slower
 ifeq ($(CONFIG_DEBUG_TCG),y)
-TIMEOUT=45
+TIMEOUT=60
 else
 TIMEOUT=15
 endif
@@ -94,7 +97,7 @@ ifdef CONFIG_USER_ONLY
 -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target
 
 # Add the common build options
-CFLAGS+=-Wall -O0 -g -fno-strict-aliasing
+CFLAGS+=-Wall -Werror -O0 -g -fno-strict-aliasing
 ifeq ($(BUILD_STATIC),y)
 LDFLAGS+=-static
 endif
@@ -126,9 +129,10 @@ RUN_TESTS=$(patsubst %,run-%, $(TESTS))
 
 # If plugins exist also include those in the tests
 ifeq ($(CONFIG_PLUGIN),y)
-PLUGIN_DIR=../../plugin
-VPATH+=$(PLUGIN_DIR)
-PLUGINS=$(notdir $(wildcard $(PLUGIN_DIR)/*.so))
+PLUGIN_SRC=$(SRC_PATH)/tests/plugin
+PLUGIN_LIB=../../plugin
+VPATH+=$(PLUGIN_LIB)
+PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c)))
 
 # We need to ensure expand the run-plugin-TEST-with-PLUGIN
 # pre-requistes manually here as we can't use stems to handle it. We
@@ -137,7 +141,7 @@ PLUGINS=$(notdir $(wildcard $(PLUGIN_DIR)/*.so))
 $(foreach p,$(PLUGINS), \
        $(foreach t,$(TESTS),\
                $(eval run-plugin-$(t)-with-$(p): $t $p) \
-               $(eval run-plugin-$(t)-with-$(p): TIMEOUT=30) \
+               $(eval run-plugin-$(t)-with-$(p): TIMEOUT=60) \
                $(eval RUN_TESTS+=run-plugin-$(t)-with-$(p))))
 endif
 
@@ -152,7 +156,7 @@ run-%: %
 
 run-plugin-%:
        $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
-               -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \
+               -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
                -d plugin -D $*.pout \
                 $(call strip-plugin,$<), \
        "$* on $(TARGET_NAME)")
@@ -168,7 +172,7 @@ run-plugin-%:
        $(call run-test, $@, \
          $(QEMU) -monitor none -display none \
                  -chardev file$(COMMA)path=$@.out$(COMMA)id=output \
-                 -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \
+                 -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
                  -d plugin -D $*.pout \
                  $(QEMU_OPTS) $(call strip-plugin,$<), \
          "$* on $(TARGET_NAME)")