[Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build

[Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build

[armbru]

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(-)

-- 
1.8.1.4

[Qemu-devel] [PATCH v2 1/2] tests: Fix schema parser test for in-tree build

[armbru]

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

[Qemu-devel] [PATCH v2 2/2] tests: Update .gitignore for test-int128 and test-bitops

[armbru]

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

Re: [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build

[Laszlo Ersek]

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

Re: [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build

[Laszlo Ersek]

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

Re: [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build

[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

> 
> (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

Re: [Qemu-devel] [PATCH v2 0/2] tests: Fixes for in-tree build

[Andreas Färber]

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