| From ba8738a0a615a51984a60be2f987b98789968fb6 Mon Sep 17 00:00:00 2001 |
| Message-Id: <ba8738a0a615a51984a60be2f987b98789968fb6.1387369730.git.minovotn@redhat.com> |
| In-Reply-To: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com> |
| References: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com> |
| From: Markus Armbruster <armbru@redhat.com> |
| Date: Tue, 10 Dec 2013 15:29:21 +0100 |
| Subject: [PATCH 21/21] tests: Fix schema parser test for in-tree build |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| RH-Author: Markus Armbruster <armbru@redhat.com> |
| Message-id: <1386689361-30281-19-git-send-email-armbru@redhat.com> |
| Patchwork-id: 56133 |
| O-Subject: [PATCH 7.0 qemu-kvm 18/18] tests: Fix schema parser test for in-tree build |
| Bugzilla: 997915 |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| RH-Acked-by: Kevin Wolf <kwolf@redhat.com> |
| RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com> |
| |
| 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> |
| Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> |
| (cherry picked from commit d8039e58b1ecfdc9af171502c83e3949f6dafb95) |
| |
| tests/.gitignore | 1 + |
| tests/Makefile | 8 ++++---- |
| 2 files changed, 5 insertions(+), 4 deletions(-) |
| |
| Signed-off-by: Michal Novotny <minovotn@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 |
| |
| |
| @@ -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 a38f360..3d196aa 100644 |
| |
| |
| @@ -233,10 +233,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.7.11.7 |
| |