From patchwork Wed Dec 21 05:35:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 707650 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tk3LF21qKz9t0v for ; Wed, 21 Dec 2016 16:36:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lv+MfZQ9"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tk3LF13lRzDwTb for ; Wed, 21 Dec 2016 16:36:37 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lv+MfZQ9"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tk3Kk693pzDwTb for ; Wed, 21 Dec 2016 16:36:10 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lv+MfZQ9"; dkim-atps=neutral Received: by mail-pf0-x242.google.com with SMTP id y68so10261149pfb.1 for ; Tue, 20 Dec 2016 21:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iyWZ9JHx8NvHdWSYFb+FXN1HyCZb0jJGgdaU3yo4bCs=; b=lv+MfZQ9NcaykHpXF1Qcjq8WVKAh57+l9qlcfZ9z+26X0CAf0ZOwctq6NxAJZDVUvi iMmRagQ5WXPvSeLinVeL1nXxecWfiFgOovBnJE+2tH6lbT4XBod6w3mPQsXeZhFUqG3V lsxn4Kt+3uAfQ96eETlbgRWeEXVEIlyVEGXUs3eRj9oJwwPIZmxE/mUlBHAhm5woH1Yj baRD7mA2GYehDmCEbiOY+et1X/z3FDSc1IMS6SlMaKSd+KWsbnW1eaMeIirH41LmZ/F3 HhX5VJnCnNW1thFYDgJLI/HXahapT9/fs9GnjLv6mw/aFrGyGBv5KXMEPGokr/Uyv6+p OqLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iyWZ9JHx8NvHdWSYFb+FXN1HyCZb0jJGgdaU3yo4bCs=; b=B6H/CmKiHdmsBHaMX3NHEBn3RbEzfhE+kKumAwJjocHM8YnD/a9Ady3QaHoiAbYhGo oVSqbRyaMhkuCKc+Ir7X5LbWTvhJUY8QiYouswRnZDWRze+ChEdW2HOxQzsAaSPf7Xjt SCJSQRuH9nEdfnPGUqrNFK7jlxkaIMXQTqviK7LrHigORom2sDGlocCS6ym2eRE59mml 5A6aTOtuTu5UQne6nJZC/CJzmRc/kPs2aBx64mAWI3URHcFe3GmY4YlJpnDWhdjD2pqO nOV6hy9AwLu6IbjzZ5MZX6KLiLI5clHD1yNsuH1Ic/yMm1sxCOR3vjjSySrSaja+Gx+f 6Bkg== X-Gm-Message-State: AIkVDXLPLYtY1RRNEFJESuHt0CgaSMEska+1CandDvgrvA2rcJB3jp/fLb18sgUWOBym4A== X-Received: by 10.99.208.21 with SMTP id z21mr4828716pgf.79.1482298568989; Tue, 20 Dec 2016 21:36:08 -0800 (PST) Received: from flat-canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id i76sm42962150pfk.89.2016.12.20.21.36.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Dec 2016 21:36:08 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Wed, 21 Dec 2016 16:35:36 +1100 Message-Id: <1482298544-8418-3-git-send-email-oohall@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482298544-8418-1-git-send-email-oohall@gmail.com> References: <1482298544-8418-1-git-send-email-oohall@gmail.com> Subject: [Skiboot] [RFC PATCH 02/10] core/test: use strcmp for console tests X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" The console logging tests use a memcmp and strlen() with string literal arguments. Unfortunately the strings were updated at some point and not kept in sync. strcmp() should be fine here so use that instead. Signed-off-by: Oliver O'Halloran --- core/test/run-console-log-pr_fmt.c | 6 +++--- core/test/run-console-log.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/test/run-console-log-pr_fmt.c b/core/test/run-console-log-pr_fmt.c index 03ee476f5265..ae9d206cb626 100644 --- a/core/test/run-console-log-pr_fmt.c +++ b/core/test/run-console-log-pr_fmt.c @@ -52,7 +52,7 @@ int main(void) debug_descriptor.console_log_levels = 0x75; prlog(PR_EMERG, "Hello World"); - assert(memcmp(console_buffer, "[ 0.000000042,0] PREFIX: Hello World", strlen("[ 0.000042,0] PREFIX: Hello World")) == 0); + assert(strcmp(console_buffer, "[ 0.000000042,0] PREFIX: Hello World") == 0); assert(flushed_to_drivers==true); memset(console_buffer, 0, sizeof(console_buffer)); @@ -63,11 +63,11 @@ int main(void) // Should not be flushed to console prlog(PR_DEBUG, "Hello World"); - assert(memcmp(console_buffer, "[ 0.000000042,7] PREFIX: Hello World", strlen("[ 0.000042,7] PREFIX: Hello World")) == 0); + assert(strcmp(console_buffer, "[ 0.000000042,7] PREFIX: Hello World") == 0); assert(flushed_to_drivers==false); printf("Hello World"); - assert(memcmp(console_buffer, "[ 0.000000042,5] PREFIX: Hello World", strlen("[ 0.000042,5] PREFIX: Hello World")) == 0); + assert(strcmp(console_buffer, "[ 0.000000042,5] PREFIX: Hello World") == 0); assert(flushed_to_drivers==true); return 0; diff --git a/core/test/run-console-log.c b/core/test/run-console-log.c index 6d6d366b2140..01376eee7334 100644 --- a/core/test/run-console-log.c +++ b/core/test/run-console-log.c @@ -52,7 +52,7 @@ int main(void) debug_descriptor.console_log_levels = 0x75; prlog(PR_EMERG, "Hello World"); - assert(memcmp(console_buffer, "[ 0.000000042,0] Hello World", strlen("[ 0.000042,0] Hello World")) == 0); + assert(strcmp(console_buffer, "[ 0.000000042,0] Hello World") == 0); assert(flushed_to_drivers==true); memset(console_buffer, 0, sizeof(console_buffer)); @@ -63,11 +63,11 @@ int main(void) // Should not be flushed to console prlog(PR_DEBUG, "Hello World"); - assert(memcmp(console_buffer, "[ 0.000000042,7] Hello World", strlen("[ 0.000042,7] Hello World")) == 0); + assert(strcmp(console_buffer, "[ 0.000000042,7] Hello World") == 0); assert(flushed_to_drivers==false); printf("Hello World"); - assert(memcmp(console_buffer, "[ 0.000000042,5] Hello World", strlen("[ 0.000042,5] Hello World")) == 0); + assert(strcmp(console_buffer, "[ 0.000000042,5] Hello World") == 0); assert(flushed_to_drivers==true); return 0;