aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2017-02-18 16:14:28 +0100
committerMarc André Tanner <mat@brain-dump.org>2017-02-18 16:20:51 +0100
commit176948356dfe02f6217ad432316c4fa51fc933f5 (patch)
tree35f47224a04529a5c255a1415b7eab1168f5e837
parent930cf2ab0b872539c59e7702042692f7638d4e89 (diff)
downloadvis-176948356dfe02f6217ad432316c4fa51fc933f5.tar.gz
vis-176948356dfe02f6217ad432316c4fa51fc933f5.tar.xz
test/core: rename files to have distinct names
Having different names for the test driver/actual implementation might make the Travis / Codecov errors less confusing.
-rw-r--r--core/.gitignore8
-rw-r--r--core/Makefile23
-rw-r--r--core/array-test.c (renamed from core/array.c)0
-rw-r--r--core/buffer-test.c (renamed from core/buffer.c)0
-rw-r--r--core/map-test.c (renamed from core/map.c)0
-rw-r--r--core/text-test.c (renamed from core/text.c)0
6 files changed, 14 insertions, 17 deletions
diff --git a/core/.gitignore b/core/.gitignore
index f14cb69..b5fdb76 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -1,8 +1,8 @@
/config.h
-/text
-/buffer
-/map
-/array
+/text-test
+/buffer-test
+/map-test
+/array-test
/ccan-config
*.gcda
*.gcno
diff --git a/core/Makefile b/core/Makefile
index 9773846..26f7fcf 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,32 +1,32 @@
-include ../../config.mk
-ALL = buffer map array text
+ALL = buffer-test map-test array-test text-test
SRC = $(wildcard ccan/*/*.c)
CFLAGS += -I. -I../.. -DBUFFER_SIZE=4 -DBLOCK_SIZE=4
test: $(ALL)
- @./buffer
- @./map
- @./array
- @./text
+ @./buffer-test
+ @./map-test
+ @./array-test
+ @./text-test
config.h:
@echo Generating ccan configuration header
@${CC} ccan-config.c -o ccan-config && ./ccan-config > config.h
-text: config.h text.c ../../text.c ../../text-util.c ../../text-motions.c ../../text-objects.c ../../text-regex.c
+text-test: config.h text-test.c ../../text.c ../../text-util.c ../../text-motions.c ../../text-objects.c ../../text-regex.c
@echo Compiling $@ binary
@${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_EXTRA} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@
-buffer: config.h buffer.c ../../buffer.c
+buffer-test: config.h buffer-test.c ../../buffer.c
@echo Compiling $@ binary
@${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_EXTRA} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@
-map: config.h map.c ../../map.c
+map-test: config.h map-test.c ../../map.c
@echo Compiling $@ binary
@${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_EXTRA} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@
-array: config.h array.c ../../array.c
+array-test: config.h array-test.c ../../array.c
@echo Compiling $@ binary
@${CC} ${CFLAGS} ${CFLAGS_STD} ${CFLAGS_EXTRA} ${filter %.c, $^} ${SRC} ${LDFLAGS} -o $@
@@ -54,10 +54,7 @@ tis: clean
clean:
@echo cleaning
- @rm -f buffer
- @rm -f map
- @rm -f array
- @rm -f text
+ @rm -f $(ALL)
@rm -f *.gcov *.gcda *.gcno
@rm -f *.valgrind
diff --git a/core/array.c b/core/array-test.c
index 5cf19a6..5cf19a6 100644
--- a/core/array.c
+++ b/core/array-test.c
diff --git a/core/buffer.c b/core/buffer-test.c
index cb3f1d9..cb3f1d9 100644
--- a/core/buffer.c
+++ b/core/buffer-test.c
diff --git a/core/map.c b/core/map-test.c
index 7a23d57..7a23d57 100644
--- a/core/map.c
+++ b/core/map-test.c
diff --git a/core/text.c b/core/text-test.c
index 5a8c001..5a8c001 100644
--- a/core/text.c
+++ b/core/text-test.c