summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Maguire <alan.maguire@oracle.com>2020-01-07 01:28:18 +0300
committerShuah Khan <skhan@linuxfoundation.org>2020-01-10 02:41:05 +0300
commit109fb06fdc6f6788df7dfbc235f7636a38e28fd4 (patch)
tree60e4a5e207e71a5884624f4954c737c16593fd55
parent4d944bcd4e731ab7bfe8d01a7041ea0ebdc090f1 (diff)
downloadlinux-109fb06fdc6f6788df7dfbc235f7636a38e28fd4.tar.xz
kunit: move string-stream.h to lib/kunit
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> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
-rw-r--r--include/kunit/assert.h3
-rw-r--r--lib/kunit/assert.c2
-rw-r--r--lib/kunit/string-stream-test.c3
-rw-r--r--lib/kunit/string-stream.c3
-rw-r--r--lib/kunit/string-stream.h (renamed from include/kunit/string-stream.h)0
-rw-r--r--lib/kunit/test.c2
6 files changed, 10 insertions, 3 deletions
diff --git a/include/kunit/assert.h b/include/kunit/assert.h
index db6a0fca09b4..ad889b539ab3 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 86013d4cf891..9aca71cee3df 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 76cc05eb00ed..6c70dc87f676 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 e6d17aacca30..350392013c14 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
index fe98a00b75a9..fe98a00b75a9 100644
--- a/include/kunit/string-stream.h
+++ b/lib/kunit/string-stream.h
diff --git a/lib/kunit/test.c b/lib/kunit/test.c
index c83c0fa59cbd..36ebf47240f8 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);