From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (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 63355253F05 for ; Fri, 21 Feb 2025 20:34:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740170084; cv=none; b=Xl2UDYSjySCDbiFdkMDGXjFAhxgpoxrp/KLOm0MLq6eII9uiYuJNMFUPivWQkVM6R3Z0Xox+mydOdAM7of0N4eKUrBgIa3ghjz+NHHIVprwNAd4kfMggDB/fIEf253TRMsB1jb22f0INQTb/icYEbSosuPlSv5APcsvlD6QMK9Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740170084; c=relaxed/simple; bh=rviAPBtUobspkNDwfOwDylqUb3/l41NbO4AFds2nZuY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=etFj4UKxJjvma7kT1g41dVYWdLEAJIBnWf6ZI6Tqxz6pFlXtIbuXtLrptLYpe7L0TuCeu81HH4V6wzqcgvqFeRl793uy8gun+c/P6RT4cLGKYw6LbO2AArrvX2aEkC4jzLWa1RELM1bYm78ffBbdKL1q2TKwJTgM8Ktt5aJ00lg= 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=M8fQ+1Dy; arc=none smtp.client-ip=209.85.219.46 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="M8fQ+1Dy" Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-6e66b4607d2so11546816d6.3 for ; Fri, 21 Feb 2025 12:34:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740170081; x=1740774881; 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=Eoi45DrFExaeO8JTjw8qgTrj/TOzu6Gqxn36YdKMoVM=; b=M8fQ+1Dypslea4RdyEgP+nsPocmhFLqxnjQiXHsIJvb553qqa38v6Oew3Hu1+iLXMQ mi9IhVIeMQ4q57ASFG9ZqYbihSDGHUS5vatXmMfWeP1sqbWKJA1BMpWyQMgrPds4VQJh 74LvlYxc8a/UgEurqa3fNHVoBoOVtN09my3aiCCzo6RQXVjsWJcTm30smIjF2FiysHit /ZZ+iUdoNpI4F5Nz/EXh6upHIdE8+DaEBCIWHQYBzCAj5SU+GLQjW1l2vLk7V/i2ngf3 KMR0PfPzBfHSxa7xU601LWIJ/YxuGhMMtYB5GzVDTxO69fRWxOMN4cXeVDcU1q32Vk9d jsHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740170081; x=1740774881; 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=Eoi45DrFExaeO8JTjw8qgTrj/TOzu6Gqxn36YdKMoVM=; b=VoLsUiT7dKJ1Zv8SPLmuivsUWv5k/cnOhn8JHcQw+zfF7jBM2cO6MAmmJjYjqwqPtN u+7GMgp2xqa7RyzafnzrbGjWyO25/4QGeztPevvvYJksaJolcLr0tSK7wAEP9hX3l6bw snDmi4/gJtQUAV0qzKxs3kOPZnY/sPlB/OOjHDKDvYvAkZhY60MKvaYIw7UjZX7K42D4 z+JRT0HewUBd2/5tSJhQ7X4dOQ0TznmQ8lys3Z6TJhMraTBEMWX4xXCRWs5kN+ApPrzr wo1OBdrB5oIET77l3YfEjCbQ57dzyue4vuR18TTskTh+25Jsl9PEVNpQ9kgGVqkW3KRh ceEQ== X-Forwarded-Encrypted: i=1; AJvYcCVe7s13zM1q4UvOSXwrTA1Rl9UhZkh4WEDWXMS3jVF0JMDtzlM4RckALqS1Z2wk443HShmrWEVYYr2z@lists.linux-m68k.org X-Gm-Message-State: AOJu0YzgyhKd1SQaVeK6t74v6PcBMzNX1R/3cKOcpzQN5iLcT79tXlMq pgABcOoeqYoVqeaLzz1p7fFEeQvSPO1MiZhpqOF4VEtVCGqp14Qi X-Gm-Gg: ASbGncvw1jR3HXcSfMcgQcL21a5hMiPriBUXEgPlszfQckdOCotfoHrhagER5njfZbQ MIn30hgvBL9RVxF0hZeOTEkbPIhSxx7WOjJMP+gAe8iVsY2R5VlizF7FUIcZMx5IvGtIgW79f2z 3J+vRHvAnsR6Qg0OSRYaftBnFrJMZMJ+xlvr6YYAX1FQkXv889PJXIoyr6o9SIIkduZpiHLtti+ 4iGZMz0FjHhlo9s7q4YLWDuLwG+tKldemaQTRDPv5HpiD/Mmr3n0UIQlXsMIBz/oeg9xxNRQkJ0 ppI9xSYuAulIfw2ZIaPHPeExdk/VQPLuT6tthfEG8lS5xbSpGw== X-Google-Smtp-Source: AGHT+IHZk626/PCbkUmvjSlL6T9hQUoiEhcd/cjugAXTLDwX+GAde7Djl8OMDd5sudOZWoO2zG+F+w== X-Received: by 2002:a05:6214:2422:b0:6d8:9a85:5b44 with SMTP id 6a1803df08f44-6e6ae9959bdmr52539466d6.29.1740170081234; Fri, 21 Feb 2025 12:34:41 -0800 (PST) Received: from tamird-mac.local ([2600:4041:5be7:7c00:880f:47d4:56c6:b852]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e65d9f36easm101677546d6.74.2025.02.21.12.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 12:34:40 -0800 (PST) From: Tamir Duberstein Date: Fri, 21 Feb 2025 15:34:32 -0500 Subject: [PATCH v5 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: <20250221-printf-kunit-convert-v5-3-5db840301730@gmail.com> References: <20250221-printf-kunit-convert-v5-0-5db840301730@gmail.com> In-Reply-To: <20250221-printf-kunit-convert-v5-0-5db840301730@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 | 62 ++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/lib/tests/printf_kunit.c b/lib/tests/printf_kunit.c index 013df6f6dd49..ed6e708ddb61 100644 --- a/lib/tests/printf_kunit.c +++ b/lib/tests/printf_kunit.c @@ -38,9 +38,9 @@ static unsigned int total_tests; 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) +static void __printf(7, 0) +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