[Xen-changelog] [qemu-upstream-unstable] tests: Fix schema parser test for in-tree build

[patchbot@xxxxxxx]

commit 7038fe818e40f8633b81462f0152a9630acdb704
Author:     Markus Armbruster <armbru@xxxxxxxxxx>
AuthorDate: Tue Sep 24 09:43:39 2013 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Mon Dec 2 21:23:18 2013 -0600

    tests: Fix schema parser test for in-tree build
    
    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@xxxxxxxxxx
    Reported-by: Laszlo Ersek <lersek@xxxxxxxxxx>
    Reviewed-by: Andreas Färber <afaerber@xxxxxxx>
    Reviewed-by: Laszlo Ersek <lersek@xxxxxxxxxx>
    Signed-off-by: Markus Armbruster <armbru@xxxxxxxxxx>
    Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
    (cherry picked from commit d8039e58b1ecfdc9af171502c83e3949f6dafb95)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 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
 
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog