lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 linux-kselftest-test 1/6] kunit: move string-stream.h to lib/kunit
    Date
    string-stream interfaces are not intended for external use;
    move them from include/kunit to lib/kunit accordingly.

    Co-developed-by: Knut Omang <knut.omang@oracle.com>
    Signed-off-by: Knut Omang <knut.omang@oracle.com>
    Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
    Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
    Tested-by: Brendan Higgins <brendanhiggins@google.com>
    ---
    include/kunit/assert.h | 3 ++-
    lib/kunit/assert.c | 2 ++
    lib/kunit/string-stream-test.c | 3 ++-
    lib/kunit/string-stream.c | 3 ++-
    {include => lib}/kunit/string-stream.h | 0
    lib/kunit/test.c | 2 ++
    6 files changed, 10 insertions(+), 3 deletions(-)
    rename {include => lib}/kunit/string-stream.h (100%)

    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..9aca71c 100644
    --- a/lib/kunit/assert.c
    +++ b/lib/kunit/assert.c
    @@ -7,6 +7,8 @@
    */
    #include <kunit/assert.h>

    +#include "string-stream.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..6c70dc8 100644
    --- a/lib/kunit/string-stream-test.c
    +++ b/lib/kunit/string-stream-test.c
    @@ -6,10 +6,11 @@
    * Author: Brendan Higgins <brendanhiggins@google.com>
    */

    -#include <kunit/string-stream.h>
    #include <kunit/test.h>
    #include <linux/slab.h>

    +#include "string-stream.h"
    +
    static void string_stream_test_empty_on_creation(struct kunit *test)
    {
    struct string_stream *stream = alloc_string_stream(test, GFP_KERNEL);
    diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c
    index e6d17aa..3503920 100644
    --- a/lib/kunit/string-stream.c
    +++ b/lib/kunit/string-stream.c
    @@ -6,11 +6,12 @@
    * Author: Brendan Higgins <brendanhiggins@google.com>
    */

    -#include <kunit/string-stream.h>
    #include <kunit/test.h>
    #include <linux/list.h>
    #include <linux/slab.h>

    +#include "string-stream.h"
    +
    struct string_stream_fragment_alloc_context {
    struct kunit *test;
    int len;
    diff --git a/include/kunit/string-stream.h b/lib/kunit/string-stream.h
    similarity index 100%
    rename from include/kunit/string-stream.h
    rename to lib/kunit/string-stream.h
    diff --git a/lib/kunit/test.c b/lib/kunit/test.c
    index c83c0fa..36ebf47 100644
    --- a/lib/kunit/test.c
    +++ b/lib/kunit/test.c
    @@ -11,6 +11,8 @@
    #include <linux/kernel.h>
    #include <linux/sched/debug.h>

    +#include "string-stream.h"
    +
    static void kunit_set_failure(struct kunit *test)
    {
    WRITE_ONCE(test->success, false);
    --
    1.8.3.1
    \
     
     \ /
      Last update: 2019-12-03 13:10    [W:4.062 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site