From patchwork Thu Jun 6 11:06:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10979319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD6D814C0 for ; Thu, 6 Jun 2019 11:17:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A64B328869 for ; Thu, 6 Jun 2019 11:17:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99CBD288BA; Thu, 6 Jun 2019 11:17:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 411A628869 for ; Thu, 6 Jun 2019 11:17:46 +0000 (UTC) Received: from localhost ([127.0.0.1]:58545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqOv-00014T-Ai for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Jun 2019 07:17:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFT-0000V3-BG for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFS-0003ks-90 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:59 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:50607) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFM-0003Oe-0o; Thu, 06 Jun 2019 07:07:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N2VGj-1gYjrl13Wh-013vCt; Thu, 06 Jun 2019 13:06:46 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:14 +0200 Message-Id: <20190606110625.32127-6-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:mdZyVMDlhLtgzFVkGMKPwhd1vTCTlJ2n6UQbcL+A7mXIwzLbgVv rdWaTvkzh9+ZGkjpPIEnoHOJoofHKJj03PiJSnWzmZUzqRXpOBY3jmF4C+vJZl5cnICB7cQ L7j1xb5jAz4it73StJCFXFaTOJbwctRdg49ymr5t30LvpGOdZYXf6TUgWyYtZ4NUA3WF/i3 PFB3LNVa1ATntBhgNggXg== X-UI-Out-Filterresults: notjunk:1;V03:K0:lGxVdu6POuc=:c8Pj8N5H0zrV72OzuTHYjr HvEThxZQTS39G9ir4HCYdnA/11jd7NfU2ekUEFMs2LPH87iAK/aQcoxTPBaVuvBRA2e7xbn+M A+Dhz9E9JjU8Ly+u8D7P9CesJcnFPStUgdvdhFZWm4HITMM1gXddx3RLjRGo3eqv30Nh8hAOE AQevROoOUgr53j5+TZv/2e425A0rT4KjV+RLjBGlB5L36Nq5bp/9+km5UAw4HtJvYAw2uvfYy 6Eb1QcFpWXBx3fosHlLdbiJpki7xj0CdfudtCd9f4wKfFnwIQyyISNeUB38zCmTfDlL89YoRo 72xZeDkiDORNcx/rW6EoHNAlkLZqEC7czmmo+ah/1ksqBYf69uuwgautN0at4fJtu8CI9/dAP qfApkM4XCf0s+qJ8514u4xAGK0k1taB6cFBViwyVW997GnTVXg+TGEfWHJbWyqP6eVB6HsQ6i MGzvxhkmrSLcmfGO4WNefexyU4sEabxATw+6LImE1Ff7/2a0eQGpAeKqM2lxxy1ICBWDe/tRN htjEx1O/AhrsL1Qmf35pqRERYdZPlYJRLFz43WIpaDzObwEiB4x2j36HmAt6UdcE8RzeVIqk6 /7mkNzzk+aEgQ9a7k1G4YnRaGsV7068KeylLJFPzWAyy1RSUqe+MhLdRV+BEf9XDGukK99tPW PrhGBgfsD9zRLt2wqcxudQvNaOmWVI+UU8TmCtGhf/gVMfqEY6NYvMihUaqPd9mKHbtHgC5I0 9xE614xtHBAUHPL7256GZLupxYmcWXuUR5ZkeXI1Qze5RIgg6WGIFD0YI4Y= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 05/16] test: Fix make target check-report.tap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Markus Armbruster , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Armbruster Fix a fat-fingered invocation of tap-merge.pl in the recipe of target check-report.tap. Fixes: 9df43317b82 "test: replace gtester with a TAP driver" Signed-off-by: Markus Armbruster Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20190604080010.23186-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 46a36c2c9527..34df040583dc 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -904,7 +904,7 @@ check-report-unit.tap: $(check-unit-y) # Reports and overall runs check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap - $(call quiet-command,./scripts/tap-merge.py $^ > $@,"GEN","$@") + $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@") # FPU Emulation tests (aka softfloat) #