Skip to contentSkip to conversation

tests: Fixes for in-tree build

PATCH Superseded [email protected] 4 participants 7 messages Aug 20, 2013 – Sep 25, 2013

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover tests: Fixes for in-tree build

From: Markus Armbruster <[email protected]>

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
#1 lore raw

PATCH v2 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
index fb05c2a..d9c2ef4 100644
@@ -19,3 +19,4 @@ test-thread-pool
 test-x86-cpuid
 test-xbzrle
 *-test
+qapi-schema/*.test.*
tests/Makefile +4 -4
index d044908..ad98439 100644
@@ -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
 
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH v2 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
index d9c2ef4..9ac044d 100644
@@ -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]
Signature · 1 line
1.8.1.4
Reviewed-by on the v2 series
#3 lore raw
In reply to [email protected]
Quoted 4 lines · On 08/20/13 13:43, [email protected] wrote:

From: Markus Armbruster <[email protected]>

v2: Nominate for qemu-stable (Andreas)

Quoted 8 lines

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

Thanks!
Laszlo

#4 lore raw
In reply to [email protected]
Quoted 4 lines · On 08/20/13 13:43, [email protected] wrote:

From: Markus Armbruster <[email protected]>

v2: Nominate for qemu-stable (Andreas)

Quoted 8 lines

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

#5 lore raw

Quoting Laszlo Ersek (2013-08-28 05:49:05)

Quoted 9 lines · On 08/20/13 13:43, [email protected] wrote:
Quoted 8 lines

From: Markus Armbruster <[email protected]>

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

Quoted 6 lines
Quoted 4 lines
 tests/.gitignore | 3 +++
 tests/Makefile   | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

Ping for this series.

Ping^2 for 1.6.1

Quoted 7 lines

(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

#6 lore raw

Am 25.09.2013 02:38, schrieb Michael Roth:

Quoted 10 lines

Quoting Laszlo Ersek (2013-08-28 05:49:05)

Quoted 9 lines · On 08/20/13 13:43, [email protected] wrote:
Quoted 8 lines

From: Markus Armbruster <[email protected]>

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

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
 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

Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg