On Thu, Oct 17, 2019 at 11:07 AM Alan Maguire <alan.maguire@xxxxxxxxxx> wrote:
Sorry for taking so long to get to this.
> string stream interfaces are not intended for external use;
> move them from include/kunit to lib/kunit/string-stream-impl.h accordingly.
>
> Signed-off-by: Alan Maguire <alan.maguire@xxxxxxxxxx>
> Signed-off-by: Knut Omang <knut.omang@xxxxxxxxxx>
> ---
> include/kunit/assert.h | 3 ++-
> include/kunit/string-stream.h | 51 ------------------------------------------
> lib/kunit/assert.c | 1 +
> lib/kunit/string-stream-impl.h | 51 ++++++++++++++++++++++++++++++++++++++++++
I agree with the move of string-stream.h from include/kunit/ to
lib/kunit/, but can you keep the name string-stream.h?
string-stream-impl.h seems a little wonky to me. Otherwise, this patch
looks good to me.
> lib/kunit/string-stream-test.c | 2 +-
> lib/kunit/string-stream.c | 3 ++-
> lib/kunit/test.c | 1 +
> 7 files changed, 58 insertions(+), 54 deletions(-)
> delete mode 100644 include/kunit/string-stream.h
> create mode 100644 lib/kunit/string-stream-impl.h
>
> diff --git a/include/kunit/assert.h b/include/kunit/assert.h
> index db6a0fc..ad889b5 100644
> --- a/include/kunit/assert.h
> +++ b/include/kunit/assert.h
> @@ -9,10 +9,11 @@
> #ifndef _KUNIT_ASSERT_H
> #define _KUNIT_ASSERT_H
>
> -#include <kunit/string-stream.h>
> #include <linux/err.h>
> +#include <linux/kernel.h>
>
> struct kunit;
> +struct string_stream;
>
> /**
> * enum kunit_assert_type - Type of expectation/assertion.
[...]
> diff --git a/lib/kunit/assert.c b/lib/kunit/assert.c
> index 86013d4..d8ae94e 100644
> --- a/lib/kunit/assert.c
> +++ b/lib/kunit/assert.c
> @@ -6,6 +6,7 @@
> * Author: Brendan Higgins <brendanhiggins@xxxxxxxxxx>
> */
> #include <kunit/assert.h>
> +#include "string-stream-impl.h"
>
> void kunit_base_assert_format(const struct kunit_assert *assert,
> struct string_stream *stream)
[...]
> diff --git a/lib/kunit/string-stream-test.c b/lib/kunit/string-stream-test.c
> index 76cc05e..25b2cf3 100644
> --- a/lib/kunit/string-stream-test.c
> +++ b/lib/kunit/string-stream-test.c
> @@ -6,9 +6,9 @@
> * Author: Brendan Higgins <brendanhiggins@xxxxxxxxxx>
> */
>
> -#include <kunit/string-stream.h>
> #include <kunit/test.h>
> #include <linux/slab.h>
> +#include "string-stream-impl.h"
>
> static void string_stream_test_empty_on_creation(struct kunit *test)
> {
> diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c
> index e6d17aa..a1e005d 100644
> --- a/lib/kunit/string-stream.c
> +++ b/lib/kunit/string-stream.c
> @@ -6,11 +6,12 @@
> * Author: Brendan Higgins <brendanhiggins@xxxxxxxxxx>
> */
>
> -#include <kunit/string-stream.h>
> #include <kunit/test.h>
> #include <linux/list.h>
> #include <linux/slab.h>
>
very minor nit: Here you put a space in the include list, elsewhere
you did not. I don't really care whether you do put the space in or
you don't (I have a slight preference for the extra space as you have
done here), but I do think it would be better if we remain consistent.
> +#include "string-stream-impl.h"
> +
> struct string_stream_fragment_alloc_context {
> struct kunit *test;
> int len;
> diff --git a/lib/kunit/test.c b/lib/kunit/test.c
> index c83c0fa..017d4fb 100644
> --- a/lib/kunit/test.c
> +++ b/lib/kunit/test.c
> @@ -10,6 +10,7 @@
> #include <kunit/try-catch.h>
> #include <linux/kernel.h>
> #include <linux/sched/debug.h>
> +#include "string-stream-impl.h"
>
> static void kunit_set_failure(struct kunit *test)
> {
> --
> 1.8.3.1
>
