tests: Fixes for in-tree build
v3 cover tests: Fixes for in-tree build
From: Markus Armbruster <[email protected]>
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(-)
Signature · 1 line
1.8.1.4
PATCH v3 1/2 tests: Fix schema parser test for in-tree build
From: Markus Armbruster <[email protected]>
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.
--- tests/.gitignore | 1 + tests/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-)
tests/.gitignore +1 -0
@@ -21,3 +21,4 @@ test-thread-pool test-x86-cpuid test-xbzrle *-test +qapi-schema/*.test.*
tests/Makefile +4 -4
@@ -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
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [Qemu-trivial] [PATCH v3 1/2] tests: Fix schema parser test for in-tree build
Quoted 5 lines · 24.09.2013 11:43, [email protected] wrote:
From: Markus Armbruster <[email protected]>
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.
[]
tests/Makefile check-tests/test-qapi.py: tests/test-qapi.py · line 267
Quoted 10 lines
.PHONY: $(patsubst %, check-%, $(check-qapi-schema-y)) $(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.jsontests/Makefile +4
-4- $(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 1/2] tests: Fix schema parser test for in-tree build
Quoted 18 lines · Michael Tokarev
Quoted 5 lines · 24.09.2013 11:43, [email protected] wrote:
From: Markus Armbruster <[email protected]>
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.
[]
Quoted 10 lines
.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")tests/Makefile +1
-3- @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)
Quoted 8 lines
tests/Makefile check-tests/test-qapi.py: tests/test-qapi.py · line 267
Quoted 5 lines
$(SRC_PATH)/tests/qapi-schema/test-qapi.py <$^ >$*.test.out 2>$*.test.err; echo $$? >$*.test.exit, " TEST $*.out")
tests/Makefile +3
-0+ @diff -q $(SRC_PATH)/$*.out $*.test.out + @diff -q $(SRC_PATH)/$*.err $*.test.err + @diff -q $(SRC_PATH)/$*.exit $*.test.exitHmm. 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?
Michael Tokarev
AppliedRe: [Qemu-devel] [Qemu-trivial] [PATCH v3 1/2] tests: Fix schema parser test for in-tree build
In reply to [email protected]Quoted 5 lines · 24.09.2013 11:43, [email protected] wrote:
From: Markus Armbruster <[email protected]>
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
PATCH v3 2/2 tests: Update .gitignore for test-int128 and test-bitops
In reply to [email protected]From: Markus Armbruster <[email protected]>
Forgotten in commit 6046c62 and 3464700.
--- tests/.gitignore | 2 ++ 1 file changed, 2 insertions(+)
tests/.gitignore +2 -0
@@ -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]
Signature · 1 line
1.8.1.4
Michael Tokarev
AppliedRe: [Qemu-devel] [Qemu-trivial] [PATCH v3 2/2] tests: Update .gitignore for test-int128 and test-bitops
Thanks,
applied to the trivial patches queue.
/mjt