From patchwork Thu Aug 4 10:39:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9263385 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F3D36048F for ; Thu, 4 Aug 2016 10:40:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EE6228210 for ; Thu, 4 Aug 2016 10:40:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 310D5283AC; Thu, 4 Aug 2016 10:40:10 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E7EA828210 for ; Thu, 4 Aug 2016 10:40:08 +0000 (UTC) Received: from localhost ([::1]:38904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVG4N-0002ar-4s for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Aug 2016 06:40:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVG45-0002al-77 for qemu-devel@nongnu.org; Thu, 04 Aug 2016 06:39:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVG44-0001DI-4E for qemu-devel@nongnu.org; Thu, 04 Aug 2016 06:39:49 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:58534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVG43-0001Co-Th for qemu-devel@nongnu.org; Thu, 04 Aug 2016 06:39:48 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bVG3v-0007Ki-M0; Thu, 04 Aug 2016 11:39:39 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 4 Aug 2016 11:39:38 +0100 Message-Id: <1470307178-22848-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH] tests: Rename qtests which have names ending "error" 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: patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We have three qtest tests which have test names ending with "error". This is awkward because the output of verbose test runs looks like /crypto/task/error: OK /crypto/task/thread_error: OK which gives false positives if you are grepping build logs for errors by looking for "error:". Since there are only three tests with this problem, just rename them all to 'failure' instead. Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrange --- Per discussion on IRC yesterday. I might throw this one into 2.7, I dunno. In particular the grep rune I run over build logs for merges looks for "error:" among other things, so these false positives are irritating. --- tests/test-io-task.c | 8 ++++---- tests/test-qmp-commands.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test-io-task.c b/tests/test-io-task.c index a36cb82..e091c12 100644 --- a/tests/test-io-task.c +++ b/tests/test-io-task.c @@ -110,7 +110,7 @@ static void test_task_data_free(void) } -static void test_task_error(void) +static void test_task_failure(void) { QIOTask *task; Object *obj = object_new(TYPE_DUMMY); @@ -214,7 +214,7 @@ static void test_task_thread_complete(void) } -static void test_task_thread_error(void) +static void test_task_thread_failure(void) { QIOTask *task; Object *obj = object_new(TYPE_DUMMY); @@ -262,8 +262,8 @@ int main(int argc, char **argv) type_register_static(&dummy_info); g_test_add_func("/crypto/task/complete", test_task_complete); g_test_add_func("/crypto/task/datafree", test_task_data_free); - g_test_add_func("/crypto/task/error", test_task_error); + g_test_add_func("/crypto/task/failure", test_task_failure); g_test_add_func("/crypto/task/thread_complete", test_task_thread_complete); - g_test_add_func("/crypto/task/thread_error", test_task_thread_error); + g_test_add_func("/crypto/task/thread_failure", test_task_thread_failure); return g_test_run(); } diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index 5af1a46..261fd9e 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -103,7 +103,7 @@ static void test_dispatch_cmd(void) } /* test commands that return an error due to invalid parameters */ -static void test_dispatch_cmd_error(void) +static void test_dispatch_cmd_failure(void) { QDict *req = qdict_new(); QObject *resp; @@ -253,7 +253,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd); - g_test_add_func("/0.15/dispatch_cmd_error", test_dispatch_cmd_error); + g_test_add_func("/0.15/dispatch_cmd_failure", test_dispatch_cmd_failure); g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io); g_test_add_func("/0.15/dealloc_types", test_dealloc_types); g_test_add_func("/0.15/dealloc_partial", test_dealloc_partial);