This reverts commit 109fb06fdc6f6788df7dfbc235f7636a38e28fd4.
string-stream will be used by kunit mocking code to print messages about
mock expectations.
It makes the code signifcantly simpler if string-stream objects can be
part of structs declared in mocking headers.
Signed-off-by: Daniel Latypov <dlatypov@xxxxxxxxxx>
---
include/kunit/assert.h | 3 +--
{lib => include}/kunit/string-stream.h | 0
lib/kunit/assert.c | 2 --
lib/kunit/string-stream-test.c | 3 +--
lib/kunit/string-stream.c | 3 +--
lib/kunit/test.c | 2 +-
6 files changed, 4 insertions(+), 9 deletions(-)
rename {lib => include}/kunit/string-stream.h (100%)
diff --git a/include/kunit/assert.h b/include/kunit/assert.h
index ad889b539ab3..db6a0fca09b4 100644
--- a/include/kunit/assert.h
+++ b/include/kunit/assert.h
@@ -9,11 +9,10 @@
#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/string-stream.h b/include/kunit/string-stream.h
similarity index 100%
rename from lib/kunit/string-stream.h
rename to include/kunit/string-stream.h
diff --git a/lib/kunit/assert.c b/lib/kunit/assert.c
index 33acdaa28a7d..9c12e30792ba 100644
--- a/lib/kunit/assert.c
+++ b/lib/kunit/assert.c
@@ -8,8 +8,6 @@
#include <kunit/assert.h>
#include <kunit/test.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 110f3a993250..121f9ab11501 100644
--- a/lib/kunit/string-stream-test.c
+++ b/lib/kunit/string-stream-test.c
@@ -6,11 +6,10 @@
* Author: Brendan Higgins <brendanhiggins@xxxxxxxxxx>
*/
+#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 141789ca8949..151a0e7ac349 100644
--- a/lib/kunit/string-stream.c
+++ b/lib/kunit/string-stream.c
@@ -6,12 +6,11 @@
* Author: Brendan Higgins <brendanhiggins@xxxxxxxxxx>
*/
+#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/lib/kunit/test.c b/lib/kunit/test.c
index c36037200310..670d1cc9c105 100644
--- a/lib/kunit/test.c
+++ b/lib/kunit/test.c
@@ -7,12 +7,12 @@
*/
#include <kunit/test.h>
+#include <kunit/string-stream.h>
#include <linux/kernel.h>
#include <linux/kref.h>
#include <linux/sched/debug.h>
#include "debugfs.h"
-#include "string-stream.h"
#include "try-catch-impl.h"
static void kunit_set_failure(struct kunit *test)
--
2.28.0.681.g6f77f65b4e-goog
