On Fri, Jan 25, 2013 at 07:55:32PM +0100, Andreas Färber wrote: > Am 23.01.2013 18:58, schrieb Eduardo Habkost: > > diff --git a/tests/Makefile b/tests/Makefile > > index d86e95a..4b98d4f 100644 > > --- a/tests/Makefile > > +++ b/tests/Makefile > > @@ -45,6 +45,10 @@ gcov-files-test-aio-$(CONFIG_WIN32) = aio-win32.c > > gcov-files-test-aio-$(CONFIG_POSIX) = aio-posix.c > > check-unit-y += tests/test-thread-pool$(EXESUF) > > gcov-files-test-thread-pool-y = thread-pool.c > > +check-unit-y += tests/test-x86-cpuid$(EXESUF) > > +# all code tested by test-x86-cpuid is inside topology.h, > > +# so add the test file itself to the gcov list > > +gcov-files-test-x86-cpuid-y = tests/test-x86-cpuid.c > > > > check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh > > > > @@ -70,12 +74,15 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o > > tests/check-qdict.o \ > > tests/test-coroutine.o tests/test-string-output-visitor.o \ > > tests/test-string-input-visitor.o tests/test-qmp-output-visitor.o \ > > tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \ > > - tests/test-qmp-commands.o tests/test-visitor-serialization.o > > + tests/test-qmp-commands.o tests/test-visitor-serialization.o \ > > + tests/test-x86-cpuid.o > > > > test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o > > > > $(test-obj-y): QEMU_INCLUDES += -Itests > > > > +tests/test-x86-cpuid.o: QEMU_INCLUDES += -Itarget-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 > > @@ -86,6 +93,7 @@ tests/test-coroutine$(EXESUF): tests/test-coroutine.o > > $(block-obj-y) libqemuutil > > tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a > > libqemustub.a > > tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(block-obj-y) > > libqemuutil.a libqemustub.a > > tests/test-iov$(EXESUF): tests/test-iov.o libqemuutil.a > > +tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o > > > > tests/test-qapi-types.c tests/test-qapi-types.h :\ > > $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py > [snip] > > > checkpatch.pl complained about encoding of (R) in topology.h not being > UTF-8. I fixed that locally, but:
Oops. For some reason mutt decided to send the e-mail using iso-8859-1 as encoding instead of utf-8. Sorry. > > CC tests/test-x86-cpuid.o > cc1: error: target-i386: No such file or directory [-Werror] > cc1: all warnings being treated as errors > make: *** [tests/test-x86-cpuid.o] Error 1 > > Eduardo, can you supply a fixup diff for out-of-tree builds please? This should fix it: diff --git a/tests/Makefile b/tests/Makefile index 4b98d4f..f6a5cbc 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -81,7 +81,7 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o $(test-obj-y): QEMU_INCLUDES += -Itests -tests/test-x86-cpuid.o: QEMU_INCLUDES += -Itarget-i386 +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 -- Eduardo
