From patchwork Tue Apr 8 22:31:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 879486 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (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 AA3D821ADC7 for ; Tue, 8 Apr 2025 22:31:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744151515; cv=none; b=LJ8RdQc4safAA7VLiDjSkD6Nq3tCGkHkKa1p0E6Z4KKT9vN2vUhzw+YxRQtIIJ/CuYNaM7rfWLooRR2k8ERIeylbChLrGaJBaRRYHGAWz8VcaGF6XqHm+vxA3G/hfY5m0LYhWwikXQfVWLp+yKJBS1X9YRuIgdeVgY0GBJWHjRI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744151515; c=relaxed/simple; bh=4WOkA299ieTu7VuMb8Ojo+52kG+DAoRovBqg0oHZuHc=; h=Content-Type:Message-ID:Date:MIME-Version:To:Cc:From:Subject; b=MWRJ0oZ8XoKy3GuwYd3sQXBSQNMPCrk9c8qIzkfuzD4cXYRNeBbGFxnDqus15Pxn9R28T/hmF8AboIeAaM9LVukqz6zZMIsMk7KltODxPYDZL5lkLxksMa8fCTyfWkrzAtSEUzOMy7l6DZyQ3MI1Lqn1MX/uQlJ2Oj213rxdULE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; spf=pass smtp.mailfrom=linuxfoundation.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TD1emFMc; arc=none smtp.client-ip=209.85.166.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TD1emFMc" Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-86135ad7b4cso78219939f.1 for ; Tue, 08 Apr 2025 15:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1744151512; x=1744756312; darn=vger.kernel.org; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=pAWzVkguP8Oqw2TYk2JCRWfNXIScPDbjXxeh1BiAU14=; b=TD1emFMc1XY5YM6vwmFWqrCXtLOoqZUwv5Nf/jAE/LIDI1szPVQN7inTDmCdDoDl1R sDnrTwqkJEKmI4ONIm5h2F20yDxC22qk8AOyi8nSthFX3+rvqY3S8njAQr4yQjW/zKWx 4IGfMHDcnERFH6RMvn6dn50ll/A60CbRUFwJs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744151512; x=1744756312; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pAWzVkguP8Oqw2TYk2JCRWfNXIScPDbjXxeh1BiAU14=; b=asY5+gGCVLftock1qdWhMel2bCJuKiennhT8sXRSYQD6Q1Xu8vIvzBC22SP25b9Ivx a7HdnZOdQ4npbzhzxKuWZruAlKwqqXc9Kg1tTHUidyAnY38Vng1fli4+4JplMQNXE8bx TfR/ZYDwXptE13UpBHOPCOrHIz0K7QRkGoADcWrVexwvkqLf2avcaxJ8/CQXWUdFh/6a qag0ayHd3tPbVLWygN3sqyjr9cBt0WDGQ3DXUM8ug2gKPwSVg2znRpzBOCXxbJ9IgO9A 38pGC5tZmmlJNLZWkLhGrY7zpO5dYI+pZOzPMyrzDKag4le217znkF/B+p4mEHN/kfe7 NCrg== X-Forwarded-Encrypted: i=1; AJvYcCWzpYthaeaV26n1ufwdkkXFjRwFY22wuDG1cFCLcHSb4krX7PEbH713DDpE+rluwnIZxgyuTU9ULBg5tC85Mpk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7qVou0TNZ00lMUIVjrSU1QJWVKz8Y9B0NhrE7mbYt/InC0hd1 FrzAapB/2r80xWTjOHLSneGgheDM3c1dBCFZ+BmNjSLGE8zJgl7ZjlvxcDZp0ttmAYjriC6ocf3 0 X-Gm-Gg: ASbGncusYHOiM0zDIekc5B25h8UhyP+jFkAmdn84ogiaxkfs2Y6A2tj8htW8mB1O5GJ jR+c7kCiRPWwITxPDEO9ajFcjzdhwz9cckG0goOvOh/mc1FJKIZEKUdCIehNWusi2CZxpS0fELX /CoyMlClUruQ0L1tjBIQe55U2tN5/qGzHsV6bIfw/QNuYGpCbfyCTC140NoLRPL9WwVY9VsgMeI KnOKqu6Cj34jO/Hbnhl+K1X6HnCPwtIBvgZnqk9V/8Lngrzw/BBfx9WSCNCnHn2Ww97ywGGTYjB MXj3N3VwVz6YGvnFPGvclz17Et6mdNGl6d7+YmD2tCis2L8CRtDFloao4DSmpJ0N5w== X-Google-Smtp-Source: AGHT+IEfU144XCFxHWsCH0yxmIdhaFa8gc+53jrOeBtBx03pWvxKk+tMbW+YaftBfnJpMNV8mVT1+g== X-Received: by 2002:a05:6602:29aa:b0:85e:1ee9:1c18 with SMTP id ca18e2360f4ac-86161281c7fmr113057939f.9.1744151511647; Tue, 08 Apr 2025 15:31:51 -0700 (PDT) Received: from [192.168.1.14] ([38.175.170.29]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f4f45087f8sm701807173.140.2025.04.08.15.31.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Apr 2025 15:31:51 -0700 (PDT) Message-ID: Date: Tue, 8 Apr 2025 16:31:50 -0600 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Linus Torvalds Cc: shuah , Shuah Khan , Brendan Higgins , David Gow , Rae Moar , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org From: Shuah Khan Subject: [GIT PULL] kunit fixes update for Linux 6.15-rc2 Hi Linus, Please pull the following kunit fixes update for Linux 6.15-rc2 Fixes tool to report test count in case of a late test plan when tests are specified before the test plan. Fixes spelling error in the commit that went into 6.15-rc1. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 0af2f6be1b4281385b618cb86ad946eded089ac8: Linux 6.15-rc1 (2025-04-06 13:11:33 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-kunit-6.15-rc2 for you to fetch changes up to d1be0cf3b8aeae75bc8fff5b7a3e01ebfe276008: kunit: Spelling s/slowm/slow/ (2025-04-08 14:57:24 -0600) ---------------------------------------------------------------- linux_kselftest-kunit-6.15-rc2 Fixes tool to report test count in case of a late test plan when tests are specified before the test plan. Fixes spelling error in the commit that went into 6.15-rc1. ---------------------------------------------------------------- Geert Uytterhoeven (1): kunit: Spelling s/slowm/slow/ Rae Moar (1): kunit: tool: fix count of tests if late test plan include/kunit/test.h | 2 +- tools/testing/kunit/kunit_parser.py | 4 ++++ tools/testing/kunit/kunit_tool_test.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------- diff --git a/include/kunit/test.h b/include/kunit/test.h index 0ffb97c78566..39c768f87dc9 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -67,7 +67,7 @@ enum kunit_status { /* * Speed Attribute is stored as an enum and separated into categories of - * speed: very_slowm, slow, and normal. These speeds are relative to + * speed: very_slow, slow, and normal. These speeds are relative to * other KUnit tests. * * Note: unset speed attribute acts as default of KUNIT_SPEED_NORMAL. diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index da53a709773a..c176487356e6 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -809,6 +809,10 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest: test.log.extend(parse_diagnostic(lines)) if test.name != "" and not peek_test_name_match(lines, test): test.add_error(printer, 'missing subtest result line!') + elif not lines: + print_log(test.log, printer) + test.status = TestStatus.NO_TESTS + test.add_error(printer, 'No more test results!') else: parse_test_result(lines, test, expected_num, printer) diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py index 5ff4f6ffd873..bbba921e0eac 100755 --- a/tools/testing/kunit/kunit_tool_test.py +++ b/tools/testing/kunit/kunit_tool_test.py @@ -371,8 +371,8 @@ class KUnitParserTest(unittest.TestCase): """ result = kunit_parser.parse_run_tests(output.splitlines(), stdout) # Missing test results after test plan should alert a suspected test crash. - self.assertEqual(kunit_parser.TestStatus.TEST_CRASHED, result.status) - self.assertEqual(result.counts, kunit_parser.TestCounts(passed=1, crashed=1, errors=1)) + self.assertEqual(kunit_parser.TestStatus.SUCCESS, result.status) + self.assertEqual(result.counts, kunit_parser.TestCounts(passed=1, errors=2)) def line_stream_from_strs(strs: Iterable[str]) -> kunit_parser.LineStream: return kunit_parser.LineStream(enumerate(strs, start=1))