aboutsummaryrefslogtreecommitdiff
path: root/lib/io/Makemodule.am
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-02 17:42:30 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-03 23:36:14 +0200
commit061fbc12fe49ff49088a644def3227d3800cd8a7 (patch)
treea9390a1c0610b3a93dddb7882956f1cb9a9ea37c /lib/io/Makemodule.am
parent3f7f3654d243275332d964f9ecbb79f9eb83a5d1 (diff)
libio: consolidate add-hoc memory istream_t implementations
In several places, there are ad-hoc istream_t implementations that read from a memory buffer to test something else stacked on top. This commit consolidates those ad-hoc implmentations into a proper one in libio, and uses the chance to remove external files for some older tests that rely on file I/O instead. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/io/Makemodule.am')
-rw-r--r--lib/io/Makemodule.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/io/Makemodule.am b/lib/io/Makemodule.am
index 5b5fc7f..7427b42 100644
--- a/lib/io/Makemodule.am
+++ b/lib/io/Makemodule.am
@@ -1,10 +1,10 @@
libio_a_SOURCES = include/io/istream.h include/io/ostream.h include/io/xfrm.h \
include/io/file.h include/io/std.h include/io/dir_entry.h \
- include/io/dir_iterator.h \
+ include/io/dir_iterator.h include/io/mem.h \
lib/io/src/internal.h lib/io/src/ostream.c \
lib/io/src/istream.c lib/io/src/get_line.c lib/io/src/xfrm/ostream.c \
lib/io/src/xfrm/istream.c lib/io/src/dir_tree_iterator.c \
- lib/io/src/dir_entry.c
+ lib/io/src/dir_entry.c lib/io/src/mem.c
libio_a_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS) $(XZ_CFLAGS)
libio_a_CFLAGS += $(ZSTD_CFLAGS) $(BZIP2_CFLAGS)
@@ -26,7 +26,6 @@ LIBIO_TESTS = test_get_line test_sparse_fb test_istream_read \
test_get_line_SOURCES = lib/io/test/get_line.c
test_get_line_LDADD = libio.a libcompat.a
test_get_line_CPPFLAGS = $(AM_CPPFLAGS)
-test_get_line_CPPFLAGS += -DTESTFILE=$(top_srcdir)/lib/io/test/get_line.txt
test_sparse_fb_SOURCES = lib/io/test/sparse_fb.c
test_sparse_fb_LDADD = libio.a libutil.a libcompat.a
@@ -97,5 +96,4 @@ endif
check_PROGRAMS += $(LIBIO_TESTS)
TESTS += $(LIBIO_TESTS)
-EXTRA_DIST += $(top_srcdir)/lib/io/test/get_line.txt
EXTRA_DIST += $(top_srcdir)/lib/io/test/testdir