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

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

[armbru]

From: Markus Armbruster <armbru@redhat.com>

Hasn't gotten maintainer attention for two months.  Retrying via
qemu-trivial.

v3: Trivially rebased
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 v3 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>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
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 ae5280e..75f06a1 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -21,3 +21,4 @@ test-thread-pool
 test-x86-cpuid
 test-xbzrle
 *-test
+qapi-schema/*.test.*
diff --git a/tests/Makefile b/tests/Makefile
index 994fef1..915ae5e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -261,10 +261,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 v3 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>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
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 75f06a1..425757c 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -5,9 +5,11 @@ check-qjson
 check-qlist
 check-qstring
 test-aio
+test-bitops
 test-throttle
 test-cutils
 test-hbitmap
+test-int128
 test-iov
 test-mul64
 test-qapi-types.[ch]
-- 
1.8.1.4

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

[Michael Tokarev]

24.09.2013 11:43, armbru@redhat.com wrote:
> 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.

[]
>   .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

Hmm.  Maybe these new files should be cleaned up somehow by
`make clean' ?

Thanks,

/mjt

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

[Michael Tokarev]

Thanks,

applied to the trivial patches queue.

/mjt

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

[Markus Armbruster]

Michael Tokarev <mjt@tls.msk.ru> writes:

> 24.09.2013 11:43, armbru@redhat.com wrote:
>> 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.
>
> []
>>   .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
>
> Hmm.  Maybe these new files should be cleaned up somehow by
> `make clean' ?

Guess so.  However, "make clean" doesn't clean *anything* in tests/
right now.  Separate fix?

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

[Michael Tokarev]

24.09.2013 11:43, armbru@redhat.com wrote:
> 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.

Thanks, applied to the trivial patches queue.

The `clean' target for tests/ would be nice to have, too... ;)

/mjt