From patchwork Tue Sep 19 11:33:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Latvala X-Patchwork-Id: 9958703 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 3B5B0601E9 for ; Tue, 19 Sep 2017 11:33:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F22128BC2 for ; Tue, 19 Sep 2017 11:33:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23E6428E08; Tue, 19 Sep 2017 11:33:14 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A046228BC2 for ; Tue, 19 Sep 2017 11:33:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D14D76E145; Tue, 19 Sep 2017 11:33:12 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from johanna3.inet.fi (mta-out1.inet.fi [62.71.2.233]) by gabe.freedesktop.org (Postfix) with ESMTP id 90C0D6E145 for ; Tue, 19 Sep 2017 11:33:11 +0000 (UTC) RazorGate-KAS: Status: not_detected RazorGate-KAS: Rate: 0 RazorGate-KAS: Envelope from: RazorGate-KAS: Version: 5.5.3 RazorGate-KAS: LuaCore: 80 2014-11-10_18-01-23 260f8afb9361da3c7edfd3a8e3a4ca908191ad29 RazorGate-KAS: Lua profiles 69136 [Nov 12 2014] RazorGate-KAS: Method: none Received: from hufflepuff.adrinael.net (84.248.197.237) by johanna3.inet.fi (9.0.002.03-2-gbe5d057) id 59A30C4902C25E48; Tue, 19 Sep 2017 14:33:10 +0300 Received: from adrinael by hufflepuff.adrinael.net with local (Exim 4.84_2) (envelope-from ) id 1duGm6-0003o2-7J; Tue, 19 Sep 2017 14:33:10 +0300 From: Petri Latvala To: intel-gfx@lists.freedesktop.org Date: Tue, 19 Sep 2017 14:33:02 +0300 Message-Id: <1505820782-14587-1-git-send-email-petri.latvala@intel.com> X-Mailer: git-send-email 2.1.4 Subject: [Intel-gfx] [PATCH i-g-t] tools_test: Clean up and fix sysfs_l3_parity X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Multiple misunderstandings of the expectations of the test and some missed parts of the shell-to-c conversion caused a couple of issues to remain. First, we need to actually disable a subbank before we check that a subbank is disabled (invoke the tool with -d). Second, the original pipe to wc -l was to check that the tool prints only one line, not that it prints "at least" a line. Modify the last check to verify that an "is disabled" text is _not_ printed. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101650 CC: Abdiel Janulgue Signed-off-by: Petri Latvala Reviewed-by: Abdiel Janulgue --- tests/tools_test.c | 83 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/tests/tools_test.c b/tests/tools_test.c index 132bb88b..ed32bb29 100644 --- a/tests/tools_test.c +++ b/tests/tools_test.c @@ -28,26 +28,31 @@ #include struct line_check { - bool found; + int found; const char *substr; }; /** * Our igt_log_buffer_inspect handler. Checks the output of the - * intel_l3_parity tool and returns line_check::found to true if - * a specific substring is found. + * intel_l3_parity tool and increments line_check::found if a specific + * substring is found. */ -static bool check_cmd_return_value(const char *line, void *data) +static bool check_cmd_output(const char *line, void *data) { struct line_check *check = data; - if (!strstr(line, check->substr)) { - check->found = false; - return false; + if (strstr(line, check->substr)) { + check->found++; } - check->found = true; - return true; + return false; +} + +static void assert_cmd_success(int exec_return) +{ + igt_skip_on_f(exec_return == IGT_EXIT_SKIP, + "intel_l3_parity not supported\n"); + igt_assert_eq(exec_return, IGT_EXIT_SUCCESS); } igt_main @@ -56,46 +61,50 @@ igt_main igt_subtest("sysfs_l3_parity") { int exec_return; + struct line_check line; + /* Sanity check that l3 parity tool is usable: Enable + * row,bank,subbank 0,0,0. + */ igt_system_cmd(exec_return, "../tools/intel_l3_parity -r 0 -b 0 " "-s 0 -e"); - igt_skip_on_f(exec_return == IGT_EXIT_SKIP, - "intel_l3_parity not supported\n"); - igt_assert_eq(exec_return, IGT_EXIT_SUCCESS); + assert_cmd_success(exec_return); + /* Disable row,bank,subbank 0,0,0. */ + igt_system_cmd(exec_return, "../tools/intel_l3_parity -r 0 -b 0 " + "-s 0 -d"); + assert_cmd_success(exec_return); + + /* Check that disabling was successful */ igt_system_cmd(exec_return, "../tools/intel_l3_parity -l"); - if (exec_return == IGT_EXIT_SUCCESS) { - struct line_check line; - line.substr = "Row 0, Bank 0, Subbank 0 is disabled"; - igt_log_buffer_inspect(check_cmd_return_value, - &line); - igt_assert_eq(line.found, true); - } + assert_cmd_success(exec_return); + line.substr = "Row 0, Bank 0, Subbank 0 is disabled"; + line.found = 0; + igt_log_buffer_inspect(check_cmd_output, + &line); + igt_assert_eq(line.found, 1); + /* Re-enable row,bank,subbank 0,0,0 */ igt_system_cmd(exec_return, "../tools/intel_l3_parity -r 0 -b 0 " "-s 0 -e"); - igt_skip_on_f(exec_return == IGT_EXIT_SKIP, - "intel_l3_parity not supported\n"); - igt_assert_eq(exec_return, IGT_EXIT_SUCCESS); + assert_cmd_success(exec_return); - /* Check that we can clear remaps: - * In the original shell script, the output of intel_l3_parity -l - * was piped thru wc -l to check if the tool would at least - * return a line. Just watch for one of the expected output - * string as an alternative. - * ("is disabled" unique only to intel_l3_parity.c:dumpit()) + /* Check that re-enabling was successful: + * intel_l3_parity -l should now not print that Row 0, + * Bank 0, Subbank 0 is disabled. + * + * The previously printed line is already in the log + * buffer so we check for count 1. */ - igt_system_cmd(exec_return, - "../tools/intel_l3_parity -l"); - if (exec_return == IGT_EXIT_SUCCESS) { - struct line_check line; - line.substr = "is disabled"; - igt_log_buffer_inspect(check_cmd_return_value, - &line); - igt_assert_eq(line.found, true); - } + igt_system_cmd(exec_return, "../tools/intel_l3_parity -l"); + assert_cmd_success(exec_return); + line.substr = "Row 0, Bank 0, Subbank 0 is disabled"; + line.found = 0; + igt_log_buffer_inspect(check_cmd_output, + &line); + igt_assert_eq(line.found, 1); } igt_subtest("tools_test") {