From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 127011FBEAF for ; Fri, 14 Feb 2025 21:53:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739569984; cv=none; b=El8yis6WS1bucvLxmAM6Cn74vGizmSMGYaIXObz4/q7DkCYyHX4Qy3MS3rOqY6eBkgoL7C9xQH+qOwHquQjLk3s38JOhWIih86VZjri9V1iwue+Faj1L68tH6+nGDEgBUK99/CG3iUvQaPlsCMokuyv4Gk1H9ZH4DIdijSbWhpA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739569984; c=relaxed/simple; bh=HavbWFUnciSTOttH8mfqU/8SObb8RPeSLGn2Jxv5I4Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XTkrImp1pg/Vf0oz+S9hyJatCOPEU/rSi8rLuJZHxRM+qHpz4cVj86siOGilEAcM9gx0nzF6Jz/HpodxurYWbT5z/w9wxae/BEnYWFXhKfqCmAIavpMMlgryeheQMadmv7OqApDLUc5lr2IHdNTisbq0fbcdvRbGe9zQ8i+nRoI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gBbl7lIB; arc=none smtp.client-ip=209.85.160.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gBbl7lIB" Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-471cfac91a4so9481581cf.3 for ; Fri, 14 Feb 2025 13:53:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739569982; x=1740174782; darn=lists.linux-m68k.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xFMliA0Dn/p4u+VrmfnKQQd+kfiJIGEDkR0ON34/fPY=; b=gBbl7lIBycm0bR6+syGwvoDnYORmXezcwzrsMm/8eqdADcdrwzraby5DkG1UmqajuI 3chafKSjIkLC6V3sIk9lrWcawyUw2t+dU9esds5XLOqEid1vfK5dF7PrXzltagP+xeJi 4NbAiw95UvMDj3qsL4l4Ymc2kcd4S+8bHcn/qP9FCkqNAXodxvyoZbSDV9ls3gA4kFym a5FOyVKRb6VW4hFlAo6l/f6zBD6YR8OO24ckMp9UekC/TwJZ30mv9ssKibC1b8EwutQE yJUFmGn+QymDNUg/2Fsmom+JGaD/p+zO3jHCjpWfCsOhIPv0XqQWPZ5q/5DyaiZVQ5oL M9Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739569982; x=1740174782; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xFMliA0Dn/p4u+VrmfnKQQd+kfiJIGEDkR0ON34/fPY=; b=dAjMaUgACYq0sJV3ostIKj+2oNq/6mX3Aoi8ZzhZNPCRoQv3ace/KYRhSIisy06Vcw nydiseQOP3oYawcDwqNuNQHaZLvm9wmMrir2FjhRJmWofnYvzVtCgnO0K3H3vyRmdeJu ZJOK/3HJeuvdKJOYr8E5WOtVnZP6urgVuYfpH6h1FTPYJ/Xufrg+qmqwUIekRtpypEHt pIjV6PLXSFp+rxZgOeWaI90tb4wyB5E98urc7eMicAvxnhDw3L3g//HhO2fnd8p4478L /EeT4AZwQDihNi5CmHH4XoqpBBnaDQg4YfMjhIezKyjM6UvYVXlmWo21yODnoWuz/g9y ukqQ== X-Forwarded-Encrypted: i=1; AJvYcCUDfgJe7O0ez0/8a1XILUKxw454gTsrKUV19Iem0y4nCPeTPi8u633C5clbGRGnpDYco7tlrst65gz9@lists.linux-m68k.org X-Gm-Message-State: AOJu0Yz42FgjAJMxDRDz6BR5cVm7qHqV9YCe42Z0y53HwpkwLEYMmYPG U70Q3LrIDVZ7oipFk4khhbUjWboDtO8aghicl0wgcLywxptn08io X-Gm-Gg: ASbGncubPKkQeztgyduxyr6DN2Zv+yH9j9QgWVmXvrJxx29eaJBXRvM5wMXLOCTGE9s YlZO3vbLESgFSp8C4fyQrigeCW7z+rB/w+eB1YjSUI/cfgqZUbSMAhqVwQFN4a74DJIxjG8Om+Z erGWxPEVESI7kSoZi+WLeH9Kq/nA+rlXbHVRSpMaS3qFXHMDjGISOFe3gi3HNfXtJld3P0EOsOG J9eezH1KVLxYgRP3tE/ilHWQCSVyxhM8n9xDoIfSAb+fayu8fOZ5atOHHFOLGktXvoAvoaryho6 R0eNTjCqJr4POhD43UNrpzsCsn4Ojl6p05R63w== X-Google-Smtp-Source: AGHT+IFHRDJwKLMxI67DD6WpGbO1HVraQMP3bdVweoIapsF2KWSn8IFdluxVK/yBTsz5cTIjR/UZbQ== X-Received: by 2002:a05:622a:241:b0:471:bce7:39e2 with SMTP id d75a77b69052e-471dbd234f4mr12562881cf.17.1739569981830; Fri, 14 Feb 2025 13:53:01 -0800 (PST) Received: from [192.168.1.159] ([2600:4041:5be7:7c00:d4df:402c:65f0:87da]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-471c2af3367sm21844451cf.59.2025.02.14.13.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 13:53:00 -0800 (PST) From: Tamir Duberstein Date: Fri, 14 Feb 2025 16:52:41 -0500 Subject: [PATCH v4 3/3] printf: implicate test line in failure messages Precedence: bulk X-Mailing-List: linux-m68k@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250214-printf-kunit-convert-v4-3-c254572f1565@gmail.com> References: <20250214-printf-kunit-convert-v4-0-c254572f1565@gmail.com> In-Reply-To: <20250214-printf-kunit-convert-v4-0-c254572f1565@gmail.com> To: Arpitha Raghunandan <98.arpi@gmail.com>, David Gow , Petr Mladek , Steven Rostedt , Andy Shevchenko , Rasmus Villemoes , Sergey Senozhatsky , Andrew Morton , Shuah Khan , Jonathan Corbet , Geert Uytterhoeven , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Brendan Higgins Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linuxppc-dev@lists.ozlabs.org, Tamir Duberstein X-Mailer: b4 0.15-dev This improves the failure output by pointing to the failing line at the top level of the test, e.g.: # test_number: EXPECTATION FAILED at lib/printf_kunit.c:103 lib/printf_kunit.c:167: vsnprintf(buf, 256, "%#-12x", ...) wrote '0x1234abcd ', expected '0x1234abce ' # test_number: EXPECTATION FAILED at lib/printf_kunit.c:142 lib/printf_kunit.c:167: kvasprintf(..., "%#-12x", ...) returned '0x1234abcd ', expected '0x1234abce ' Signed-off-by: Tamir Duberstein --- lib/tests/printf_kunit.c | 60 ++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/lib/tests/printf_kunit.c b/lib/tests/printf_kunit.c index 013df6f6dd49..aa5011156788 100644 --- a/lib/tests/printf_kunit.c +++ b/lib/tests/printf_kunit.c @@ -39,8 +39,8 @@ static char *test_buffer; static char *alloced_buffer; static void __printf(5, 0) -do_test(struct kunit *kunittest, int bufsize, const char *expect, int elen, - const char *fmt, va_list ap) +do_test(struct kunit *kunittest, const char *file, const int line, int bufsize, const char *expect, + int elen, const char *fmt, va_list ap) { va_list aq; int ret, written; @@ -53,21 +53,24 @@ do_test(struct kunit *kunittest, int bufsize, const char *expect, int elen, va_end(aq); if (ret != elen) { - KUNIT_FAIL(kunittest, "vsnprintf(buf, %d, \"%s\", ...) returned %d, expected %d", - bufsize, fmt, ret, elen); + KUNIT_FAIL(kunittest, + "%s:%d: vsnprintf(buf, %d, \"%s\", ...) returned %d, expected %d", + file, line, bufsize, fmt, ret, elen); return; } if (memchr_inv(alloced_buffer, FILL_CHAR, PAD_SIZE)) { - KUNIT_FAIL(kunittest, "vsnprintf(buf, %d, \"%s\", ...) wrote before buffer", - bufsize, fmt); + KUNIT_FAIL(kunittest, + "%s:%d: vsnprintf(buf, %d, \"%s\", ...) wrote before buffer", + file, line, bufsize, fmt); return; } if (!bufsize) { if (memchr_inv(test_buffer, FILL_CHAR, BUF_SIZE + PAD_SIZE)) { - KUNIT_FAIL(kunittest, "vsnprintf(buf, 0, \"%s\", ...) wrote to buffer", - fmt); + KUNIT_FAIL(kunittest, + "%s:%d: vsnprintf(buf, 0, \"%s\", ...) wrote to buffer", + file, line, fmt); } return; } @@ -75,33 +78,36 @@ do_test(struct kunit *kunittest, int bufsize, const char *expect, int elen, written = min(bufsize-1, elen); if (test_buffer[written]) { KUNIT_FAIL(kunittest, - "vsnprintf(buf, %d, \"%s\", ...) did not nul-terminate buffer", - bufsize, fmt); + "%s:%d: vsnprintf(buf, %d, \"%s\", ...) did not nul-terminate buffer", + file, line, bufsize, fmt); return; } if (memchr_inv(test_buffer + written + 1, FILL_CHAR, bufsize - (written + 1))) { KUNIT_FAIL(kunittest, - "vsnprintf(buf, %d, \"%s\", ...) wrote beyond the nul-terminator", - bufsize, fmt); + "%s:%d: vsnprintf(buf, %d, \"%s\", ...) wrote beyond the nul-terminator", + file, line, bufsize, fmt); return; } if (memchr_inv(test_buffer + bufsize, FILL_CHAR, BUF_SIZE + PAD_SIZE - bufsize)) { - KUNIT_FAIL(kunittest, "vsnprintf(buf, %d, \"%s\", ...) wrote beyond buffer", - bufsize, fmt); + KUNIT_FAIL(kunittest, + "%s:%d: vsnprintf(buf, %d, \"%s\", ...) wrote beyond buffer", + file, line, bufsize, fmt); return; } if (memcmp(test_buffer, expect, written)) { - KUNIT_FAIL(kunittest, "vsnprintf(buf, %d, \"%s\", ...) wrote '%s', expected '%.*s'", - bufsize, fmt, test_buffer, written, expect); + KUNIT_FAIL(kunittest, + "%s:%d: vsnprintf(buf, %d, \"%s\", ...) wrote '%s', expected '%.*s'", + file, line, bufsize, fmt, test_buffer, written, expect); return; } } -static void __printf(4, 0) -__test(struct kunit *kunittest, const char *expect, int elen, const char *fmt, ...) +static void __printf(6, 0) +__test(struct kunit *kunittest, const char *file, const int line, const char *expect, int elen, + const char *fmt, ...) { va_list ap; int rand; @@ -109,8 +115,8 @@ __test(struct kunit *kunittest, const char *expect, int elen, const char *fmt, . if (elen >= BUF_SIZE) { KUNIT_FAIL(kunittest, - "error in test suite: expected length (%d) >= BUF_SIZE (%d). fmt=\"%s\"", - elen, BUF_SIZE, fmt); + "%s:%d: error in test suite: expected length (%d) >= BUF_SIZE (%d). fmt=\"%s\"", + file, line, elen, BUF_SIZE, fmt); return; } @@ -122,19 +128,19 @@ __test(struct kunit *kunittest, const char *expect, int elen, const char *fmt, . * enough and 0), and then we also test that kvasprintf would * be able to print it as expected. */ - do_test(kunittest, BUF_SIZE, expect, elen, fmt, ap); + do_test(kunittest, file, line, BUF_SIZE, expect, elen, fmt, ap); rand = get_random_u32_inclusive(1, elen + 1); /* Since elen < BUF_SIZE, we have 1 <= rand <= BUF_SIZE. */ - do_test(kunittest, rand, expect, elen, fmt, ap); - do_test(kunittest, 0, expect, elen, fmt, ap); + do_test(kunittest, file, line, rand, expect, elen, fmt, ap); + do_test(kunittest, file, line, 0, expect, elen, fmt, ap); p = kvasprintf(GFP_KERNEL, fmt, ap); if (p) { total_tests++; if (memcmp(p, expect, elen+1)) { KUNIT_FAIL(kunittest, - "kvasprintf(..., \"%s\", ...) returned '%s', expected '%s'", - fmt, p, expect); + "%s:%d: kvasprintf(..., \"%s\", ...) returned '%s', expected '%s'", + file, line, fmt, p, expect); } kfree(p); } @@ -142,7 +148,7 @@ __test(struct kunit *kunittest, const char *expect, int elen, const char *fmt, . } #define test(expect, fmt, ...) \ - __test(kunittest, expect, strlen(expect), fmt, ##__VA_ARGS__) + __test(kunittest, __FILE__, __LINE__, expect, strlen(expect), fmt, ##__VA_ARGS__) static void test_basic(struct kunit *kunittest) @@ -153,7 +159,7 @@ test_basic(struct kunit *kunittest) test("", &nul); test("100%", "100%%"); test("xxx%yyy", "xxx%cyyy", '%'); - __test(kunittest, "xxx\0yyy", 7, "xxx%cyyy", '\0'); + __test(kunittest, __FILE__, __LINE__, "xxx\0yyy", 7, "xxx%cyyy", '\0'); } static void -- 2.48.1