From patchwork Tue Aug 20 11:43:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 268499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E76AB2C0124 for ; Tue, 20 Aug 2013 21:43:58 +1000 (EST) Received: from localhost ([::1]:47167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBkLs-0003is-Ic for incoming@patchwork.ozlabs.org; Tue, 20 Aug 2013 07:43:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBkLK-0003iC-Ts for qemu-devel@nongnu.org; Tue, 20 Aug 2013 07:43:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBkLG-00067l-6N for qemu-devel@nongnu.org; Tue, 20 Aug 2013 07:43:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9087) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBkLF-00067Q-Uf; Tue, 20 Aug 2013 07:43:18 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7KBhF09012474 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Aug 2013 07:43:15 -0400 Received: from blackfin.pond.sub.org (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r7KBhE41018795; Tue, 20 Aug 2013 07:43:15 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2B3FA200B9; Tue, 20 Aug 2013 13:43:14 +0200 (CEST) From: armbru@redhat.com To: qemu-devel@nongnu.org Date: Tue, 20 Aug 2013 13:43:13 +0200 Message-Id: <1376998994-30744-2-git-send-email-armbru@redhat.com> In-Reply-To: <1376998994-30744-1-git-send-email-armbru@redhat.com> References: <1376998994-30744-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id r7KBhF09012474 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: lersek@redhat.com, afaerber@suse.de, anthony@codemonkey.ws, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH v2 1/2] tests: Fix schema parser test for in-tree build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster 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 Reviewed-by: Andreas Färber Signed-off-by: Markus Armbruster --- 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