e2ed78d5d9
This KUnit next update for Linux 6.2-rc1 consists of several enhancements, fixes, clean-ups, documentation updates, improvements to logging and KTAP compliance of KUnit test output: - log numbers in decimal and hex - parse KTAP compliant test output - allow conditionally exposing static symbols to tests when KUNIT is enabled - make static symbols visible during kunit testing - clean-ups to remove unused structure definition -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPZKym/RZuOCGeA/kCwJExA0NQxwFAmOXnPYACgkQCwJExA0N Qxwf9RAAwdBKxgPZuKZ40v69Jm8YhaO3vyKUkyYRH59/HQGFUHMA2f2ONez4krEX iXPgBFQ+7pB63FdgQi2HSg2z/u3xY02AaGgZGXDuNJDmg2xYjNDfZ0GjN6tuavlN Liz01DGZkjZoVVXM6oV2xT8woBg/0BbdkKNL1OBO9RBZFHzwDryRzfXmQb8cKlNr S+tkeZTlCA/s7UW2LNj4VlTzn6wgni4Y9gSk4wbQmSGWn3OX3rHaqAb7GiZ/yPGb 1WjbMeE8FwyydLU40aOZZ8V6AJRiw5VGPJyFzWJyWZ21xOgN9Z95b+I36z8RXraA i/wnazO/FJsrhzvKL83rQkrSW6bpmVY+jGvk+L6deFM6Ro/vEWHJ4DgyKsIdMiJy gUM1Q69szptq+ZRHGrZWPlVONBkBXMOL+fePbCbGcMzlaEAS/zsFYW9IBKcvLzwP uHzzMS/cMmSUq52ZIyl9jhHQFVSoErCpJwQjAaZBQpYXPmE7yLcZItxnCaSUQTay bRwyps5ph5md0oJTTFJKZ4Zx5FJ2ItjbC4y9BIexb9gYRDdRq723ivDoVENZl/Zk DFIV95AY+mSxadS5vFagwWwX0ZN0KFKxeM8Tw7VTimal/0Sbglqp+oflsuKFD6JQ b5HUixYifKMbWxkH5xrUb8NdjmBj561TYa8U4N+j3oOiaPYu5Ss= =UQNn -----END PGP SIGNATURE----- Merge tag 'linux-kselftest-kunit-next-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest Pull KUnit updates from Shuah Khan: "Several enhancements, fixes, clean-ups, documentation updates, improvements to logging and KTAP compliance of KUnit test output: - log numbers in decimal and hex - parse KTAP compliant test output - allow conditionally exposing static symbols to tests when KUNIT is enabled - make static symbols visible during kunit testing - clean-ups to remove unused structure definition" * tag 'linux-kselftest-kunit-next-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (29 commits) Documentation: dev-tools: Clarify requirements for result description apparmor: test: make static symbols visible during kunit testing kunit: add macro to allow conditionally exposing static symbols to tests kunit: tool: make parser preserve whitespace when printing test log Documentation: kunit: Fix "How Do I Use This" / "Next Steps" sections kunit: tool: don't include KTAP headers and the like in the test log kunit: improve KTAP compliance of KUnit test output kunit: tool: parse KTAP compliant test output mm: slub: test: Use the kunit_get_current_test() function kunit: Use the static key when retrieving the current test kunit: Provide a static key to check if KUnit is actively running tests kunit: tool: make --json do nothing if --raw_ouput is set kunit: tool: tweak error message when no KTAP found kunit: remove KUNIT_INIT_MEM_ASSERTION macro Documentation: kunit: Remove redundant 'tips.rst' page Documentation: KUnit: reword description of assertions Documentation: KUnit: make usage.rst a superset of tips.rst, remove duplication kunit: eliminate KUNIT_INIT_*_ASSERT_STRUCT macros kunit: tool: remove redundant file.close() call in unit test kunit: tool: unit tests all check parser errors, standardize formatting a bit ...
154 lines
3.4 KiB
C
154 lines
3.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* C++ stream style string builder used in KUnit for building messages.
|
|
*
|
|
* Copyright (C) 2019, Google LLC.
|
|
* Author: Brendan Higgins <brendanhiggins@google.com>
|
|
*/
|
|
|
|
#include <kunit/test.h>
|
|
#include <linux/list.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "string-stream.h"
|
|
|
|
|
|
static struct string_stream_fragment *alloc_string_stream_fragment(
|
|
struct kunit *test, int len, gfp_t gfp)
|
|
{
|
|
struct string_stream_fragment *frag;
|
|
|
|
frag = kunit_kzalloc(test, sizeof(*frag), gfp);
|
|
if (!frag)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
frag->fragment = kunit_kmalloc(test, len, gfp);
|
|
if (!frag->fragment)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
return frag;
|
|
}
|
|
|
|
static void string_stream_fragment_destroy(struct kunit *test,
|
|
struct string_stream_fragment *frag)
|
|
{
|
|
list_del(&frag->node);
|
|
kunit_kfree(test, frag->fragment);
|
|
kunit_kfree(test, frag);
|
|
}
|
|
|
|
int string_stream_vadd(struct string_stream *stream,
|
|
const char *fmt,
|
|
va_list args)
|
|
{
|
|
struct string_stream_fragment *frag_container;
|
|
int len;
|
|
va_list args_for_counting;
|
|
|
|
/* Make a copy because `vsnprintf` could change it */
|
|
va_copy(args_for_counting, args);
|
|
|
|
/* Need space for null byte. */
|
|
len = vsnprintf(NULL, 0, fmt, args_for_counting) + 1;
|
|
|
|
va_end(args_for_counting);
|
|
|
|
frag_container = alloc_string_stream_fragment(stream->test,
|
|
len,
|
|
stream->gfp);
|
|
if (IS_ERR(frag_container))
|
|
return PTR_ERR(frag_container);
|
|
|
|
len = vsnprintf(frag_container->fragment, len, fmt, args);
|
|
spin_lock(&stream->lock);
|
|
stream->length += len;
|
|
list_add_tail(&frag_container->node, &stream->fragments);
|
|
spin_unlock(&stream->lock);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int string_stream_add(struct string_stream *stream, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
int result;
|
|
|
|
va_start(args, fmt);
|
|
result = string_stream_vadd(stream, fmt, args);
|
|
va_end(args);
|
|
|
|
return result;
|
|
}
|
|
|
|
static void string_stream_clear(struct string_stream *stream)
|
|
{
|
|
struct string_stream_fragment *frag_container, *frag_container_safe;
|
|
|
|
spin_lock(&stream->lock);
|
|
list_for_each_entry_safe(frag_container,
|
|
frag_container_safe,
|
|
&stream->fragments,
|
|
node) {
|
|
string_stream_fragment_destroy(stream->test, frag_container);
|
|
}
|
|
stream->length = 0;
|
|
spin_unlock(&stream->lock);
|
|
}
|
|
|
|
char *string_stream_get_string(struct string_stream *stream)
|
|
{
|
|
struct string_stream_fragment *frag_container;
|
|
size_t buf_len = stream->length + 1; /* +1 for null byte. */
|
|
char *buf;
|
|
|
|
buf = kunit_kzalloc(stream->test, buf_len, stream->gfp);
|
|
if (!buf)
|
|
return NULL;
|
|
|
|
spin_lock(&stream->lock);
|
|
list_for_each_entry(frag_container, &stream->fragments, node)
|
|
strlcat(buf, frag_container->fragment, buf_len);
|
|
spin_unlock(&stream->lock);
|
|
|
|
return buf;
|
|
}
|
|
|
|
int string_stream_append(struct string_stream *stream,
|
|
struct string_stream *other)
|
|
{
|
|
const char *other_content;
|
|
|
|
other_content = string_stream_get_string(other);
|
|
|
|
if (!other_content)
|
|
return -ENOMEM;
|
|
|
|
return string_stream_add(stream, other_content);
|
|
}
|
|
|
|
bool string_stream_is_empty(struct string_stream *stream)
|
|
{
|
|
return list_empty(&stream->fragments);
|
|
}
|
|
|
|
struct string_stream *alloc_string_stream(struct kunit *test, gfp_t gfp)
|
|
{
|
|
struct string_stream *stream;
|
|
|
|
stream = kunit_kzalloc(test, sizeof(*stream), gfp);
|
|
if (!stream)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
stream->gfp = gfp;
|
|
stream->test = test;
|
|
INIT_LIST_HEAD(&stream->fragments);
|
|
spin_lock_init(&stream->lock);
|
|
|
|
return stream;
|
|
}
|
|
|
|
void string_stream_destroy(struct string_stream *stream)
|
|
{
|
|
string_stream_clear(stream);
|
|
}
|