[Qemu-devel] [PATCH 1/2] tests/Makefile: Add more dependencies for test-timed-average

[Kevin Wolf]

'make check' failed to compile the test case for mingw because of
undefined references. Pull in a few more dependencies so that it builds.

Signed-off-by: Kevin Wolf 
---
 tests/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index b937984..47fe5d5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -416,7 +416,8 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \
$(test-qom-obj-y)
 tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o \
libqemuutil.a stubs/clock-warp.o stubs/cpu-get-icount.o \
-   stubs/notify-event.o stubs/replay.o
+   stubs/notify-event.o stubs/replay.o stubs/mon-is-qmp.o 
stubs/fd-register.o \
+   stubs/mon-printf.o
 
 tests/test-qapi-types.c tests/test-qapi-types.h :\
 $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json 
$(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 1/2] tests/Makefile: Add more dependencies for test-timed-average

[Paolo Bonzini]

On 23/11/2015 13:39, Kevin Wolf wrote:
>  tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o \
>   libqemuutil.a stubs/clock-warp.o stubs/cpu-get-icount.o \
> - stubs/notify-event.o stubs/replay.o
> + stubs/notify-event.o stubs/replay.o stubs/mon-is-qmp.o 
> stubs/fd-register.o \
> + stubs/mon-printf.o
>  

Why not just add libqemustub.a?  (If it works, do not even bother
reposting).

Paolo

Re: [Qemu-devel] [PATCH 1/2] tests/Makefile: Add more dependencies for test-timed-average

[Kevin Wolf]

Am 23.11.2015 um 15:46 hat Paolo Bonzini geschrieben:
> On 23/11/2015 13:39, Kevin Wolf wrote:
> >  tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o 
> > \
> > libqemuutil.a stubs/clock-warp.o stubs/cpu-get-icount.o \
> > -   stubs/notify-event.o stubs/replay.o
> > +   stubs/notify-event.o stubs/replay.o stubs/mon-is-qmp.o 
> > stubs/fd-register.o \
> > +   stubs/mon-printf.o
> >  
> 
> Why not just add libqemustub.a?  (If it works, do not even bother
> reposting).

Didn't remember that that's a thing and didn't check because the rule
already pulled in a few stubs manually. I'll go with the version below
then. (And given that you only gave an R-b, I guess I should take this
through my tree?)

Kevin


diff --git a/tests/Makefile b/tests/Makefile
index b937984..0ef00a1 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -415,8 +415,7 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \
 migration/qemu-file-unix.o qjson.o \
$(test-qom-obj-y)
 tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o \
-   libqemuutil.a stubs/clock-warp.o stubs/cpu-get-icount.o \
-   stubs/notify-event.o stubs/replay.o
+   $(test-util-obj-y)
 
 tests/test-qapi-types.c tests/test-qapi-types.h :\
 $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json 
$(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

Re: [Qemu-devel] [PATCH 1/2] tests/Makefile: Add more dependencies for test-timed-average

[Paolo Bonzini]

On 23/11/2015 17:09, Kevin Wolf wrote:
> Am 23.11.2015 um 15:46 hat Paolo Bonzini geschrieben:
>> On 23/11/2015 13:39, Kevin Wolf wrote:
>>>  tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o 
>>> \
>>> libqemuutil.a stubs/clock-warp.o stubs/cpu-get-icount.o \
>>> -   stubs/notify-event.o stubs/replay.o
>>> +   stubs/notify-event.o stubs/replay.o stubs/mon-is-qmp.o 
>>> stubs/fd-register.o \
>>> +   stubs/mon-printf.o
>>>  
>>
>> Why not just add libqemustub.a?  (If it works, do not even bother
>> reposting).
> 
> Didn't remember that that's a thing and didn't check because the rule
> already pulled in a few stubs manually. I'll go with the version below
> then. (And given that you only gave an R-b, I guess I should take this
> through my tree?)

Yes please, they are block layer tests.

Paolo

> Kevin
> 
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index b937984..0ef00a1 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -415,8 +415,7 @@ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \
>  migration/qemu-file-unix.o qjson.o \
> $(test-qom-obj-y)
>  tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o \
> -   libqemuutil.a stubs/clock-warp.o stubs/cpu-get-icount.o \
> -   stubs/notify-event.o stubs/replay.o
> +   $(test-util-obj-y)
>  
>  tests/test-qapi-types.c tests/test-qapi-types.h :\
>  $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json 
> $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
>