* [Qemu-devel] [PATCH v2 1/2] tests: Fix schema parser test for in-tree build
2013-08-20 11:43 [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build armbru
@ 2013-08-20 11:43 ` armbru
2013-08-20 11:43 ` [Qemu-devel] [PATCH v2 2/2] tests: Update .gitignore for test-int128 and test-bitops armbru
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: armbru @ 2013-08-20 11:43 UTC (permalink / raw)
To: qemu-devel; +Cc: lersek, afaerber, anthony, qemu-stable
From: Markus Armbruster <armbru@redhat.com>
Commit 4f193e3 added the test, but screwed up in-tree builds
(SRCDIR=.): the tests's output overwrites the expected output, and is
thus compared to itself.
Cc: qemu-stable@nongnu.org
Reported-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/.gitignore | 1 +
tests/Makefile | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/.gitignore b/tests/.gitignore
index fb05c2a..d9c2ef4 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -19,3 +19,4 @@ test-thread-pool
test-x86-cpuid
test-xbzrle
*-test
+qapi-schema/*.test.*
diff --git a/tests/Makefile b/tests/Makefile
index d044908..ad98439 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -247,10 +247,10 @@ check-tests/test-qapi.py: tests/test-qapi.py
.PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
$(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
- $(call quiet-command, PYTHONPATH=$(SRC_PATH)/scripts $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py <$^ >$*.out 2>$*.err; echo $$? >$*.exit, " TEST $*.out")
- @diff -q $(SRC_PATH)/$*.out $*.out
- @diff -q $(SRC_PATH)/$*.err $*.err
- @diff -q $(SRC_PATH)/$*.exit $*.exit
+ $(call quiet-command, PYTHONPATH=$(SRC_PATH)/scripts $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py <$^ >$*.test.out 2>$*.test.err; echo $$? >$*.test.exit, " TEST $*.out")
+ @diff -q $(SRC_PATH)/$*.out $*.test.out
+ @diff -q $(SRC_PATH)/$*.err $*.test.err
+ @diff -q $(SRC_PATH)/$*.exit $*.test.exit
# Consolidated targets
--
1.8.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PATCH v2 2/2] tests: Update .gitignore for test-int128 and test-bitops
2013-08-20 11:43 [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build armbru
2013-08-20 11:43 ` [Qemu-devel] [PATCH v2 1/2] tests: Fix schema parser test " armbru
@ 2013-08-20 11:43 ` armbru
2013-08-21 7:04 ` [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build Laszlo Ersek
2013-08-28 10:49 ` Laszlo Ersek
3 siblings, 0 replies; 7+ messages in thread
From: armbru @ 2013-08-20 11:43 UTC (permalink / raw)
To: qemu-devel; +Cc: lersek, afaerber, anthony, qemu-stable
From: Markus Armbruster <armbru@redhat.com>
Forgotten in commit 6046c62 and 3464700.
Cc: qemu-stable@nongnu.org
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/.gitignore b/tests/.gitignore
index d9c2ef4..9ac044d 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -5,8 +5,10 @@ check-qjson
check-qlist
check-qstring
test-aio
+test-bitops
test-cutils
test-hbitmap
+test-int128
test-iov
test-mul64
test-qapi-types.[ch]
--
1.8.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build
2013-08-20 11:43 [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build armbru
2013-08-20 11:43 ` [Qemu-devel] [PATCH v2 1/2] tests: Fix schema parser test " armbru
2013-08-20 11:43 ` [Qemu-devel] [PATCH v2 2/2] tests: Update .gitignore for test-int128 and test-bitops armbru
@ 2013-08-21 7:04 ` Laszlo Ersek
2013-08-28 10:49 ` Laszlo Ersek
3 siblings, 0 replies; 7+ messages in thread
From: Laszlo Ersek @ 2013-08-21 7:04 UTC (permalink / raw)
To: armbru; +Cc: qemu-stable, qemu-devel, anthony, afaerber
On 08/20/13 13:43, armbru@redhat.com wrote:
> From: Markus Armbruster <armbru@redhat.com>
>
> v2: Nominate for qemu-stable (Andreas)
>
> Markus Armbruster (2):
> tests: Fix schema parser test for in-tree build
> tests: Update .gitignore for test-int128 and test-bitops
>
> tests/.gitignore | 3 +++
> tests/Makefile | 8 ++++----
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
Reviewed-by: Laszlo Ersek <lersek@redht.com>
Thanks!
Laszlo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build
2013-08-20 11:43 [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build armbru
` (2 preceding siblings ...)
2013-08-21 7:04 ` [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build Laszlo Ersek
@ 2013-08-28 10:49 ` Laszlo Ersek
2013-09-25 0:38 ` Michael Roth
3 siblings, 1 reply; 7+ messages in thread
From: Laszlo Ersek @ 2013-08-28 10:49 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-stable, armbru, anthony, afaerber
On 08/20/13 13:43, armbru@redhat.com wrote:
> From: Markus Armbruster <armbru@redhat.com>
>
> v2: Nominate for qemu-stable (Andreas)
>
> Markus Armbruster (2):
> tests: Fix schema parser test for in-tree build
> tests: Update .gitignore for test-int128 and test-bitops
>
> tests/.gitignore | 3 +++
> tests/Makefile | 8 ++++----
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
Ping for this series.
(It's not mine, but if people want me to "consolidate" the test-* files
from .gitignore to tests/.gitignore, then this series has to be applied
first.)
Thanks
Laszlo
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build
2013-08-28 10:49 ` Laszlo Ersek
@ 2013-09-25 0:38 ` Michael Roth
2013-09-25 2:40 ` Andreas Färber
0 siblings, 1 reply; 7+ messages in thread
From: Michael Roth @ 2013-09-25 0:38 UTC (permalink / raw)
To: Laszlo Ersek, qemu-devel; +Cc: afaerber, qemu-stable, anthony, armbru
Quoting Laszlo Ersek (2013-08-28 05:49:05)
> On 08/20/13 13:43, armbru@redhat.com wrote:
> > From: Markus Armbruster <armbru@redhat.com>
> >
> > v2: Nominate for qemu-stable (Andreas)
> >
> > Markus Armbruster (2):
> > tests: Fix schema parser test for in-tree build
> > tests: Update .gitignore for test-int128 and test-bitops
> >
> > tests/.gitignore | 3 +++
> > tests/Makefile | 8 ++++----
> > 2 files changed, 7 insertions(+), 4 deletions(-)
> >
>
> Ping for this series.
Ping^2 for 1.6.1
>
> (It's not mine, but if people want me to "consolidate" the test-* files
> from .gitignore to tests/.gitignore, then this series has to be applied
> first.)
>
> Thanks
> Laszlo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build
2013-09-25 0:38 ` Michael Roth
@ 2013-09-25 2:40 ` Andreas Färber
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Färber @ 2013-09-25 2:40 UTC (permalink / raw)
To: Michael Roth; +Cc: armbru, Laszlo Ersek, qemu-devel, anthony, qemu-stable
Am 25.09.2013 02:38, schrieb Michael Roth:
> Quoting Laszlo Ersek (2013-08-28 05:49:05)
>> On 08/20/13 13:43, armbru@redhat.com wrote:
>>> From: Markus Armbruster <armbru@redhat.com>
>>>
>>> v2: Nominate for qemu-stable (Andreas)
>>>
>>> Markus Armbruster (2):
>>> tests: Fix schema parser test for in-tree build
>>> tests: Update .gitignore for test-int128 and test-bitops
>>>
>>> tests/.gitignore | 3 +++
>>> tests/Makefile | 8 ++++----
>>> 2 files changed, 7 insertions(+), 4 deletions(-)
>>>
>>
>> Ping for this series.
>
> Ping^2 for 1.6.1
There has been a v3, and I believe mjt picked it up. :)
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 7+ messages in thread