aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-03 00:29:17 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-03-03 00:29:17 +0000
commit0856579cac2f1dacecd847cfcd89680d26ff78f5 (patch)
tree6ab14c4d57029b50bf6ec08b4b881bfad0625217 /tests/Makefile
parentb8a173b25c887a606681fc35a46702c164d5b2d0 (diff)
Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging"
This reverts commit b8a173b25c887a606681fc35a46702c164d5b2d0, reversing changes made to 5de090464f1ec5360c4f30faa01d8a9f8826cd58. (I applied this pull request when I should not have done so, and am now immediately reverting it.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/Makefile')
-rw-r--r--tests/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 7d4b96d4fd..307035c26c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -239,6 +239,8 @@ $(test-obj-y): QEMU_INCLUDES += -Itests
QEMU_CFLAGS += -I$(SRC_PATH)/tests
qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o
+tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386
+
tests/check-qint$(EXESUF): tests/check-qint.o libqemuutil.a
tests/check-qstring$(EXESUF): tests/check-qstring.o libqemuutil.a
tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a