From 4916320ec374cc5d2b4062c48d2e4c576472b739 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 17 Apr 2019 17:38:14 +0000
Subject: [PATCH] Separate test cases from examples

Also adds a runtests makefile target.
---
 Makefile                           |  4 ++++
 examples/Makefile                  | 17 +++++++++++++++++
 {test => examples}/io_uring-cp.c   |  0
 {test => examples}/io_uring-test.c |  0
 test/Makefile                      | 16 +++++++---------
 5 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 examples/Makefile
 rename {test => examples}/io_uring-cp.c (100%)
 rename {test => examples}/io_uring-test.c (100%)

diff --git a/Makefile b/Makefile
index fe4fcb4..e78c990 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,10 @@ default: all
 all:
 	@$(MAKE) -C src
 	@$(MAKE) -C test
+	@$(MAKE) -C examples
+
+runtests:
+	@$(MAKE) -C test runtests
 
 config-host.mak: configure
 	@if [ ! -e "$@" ]; then					\
diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644
index 0000000..067fb94
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,17 @@
+CFLAGS ?= -g -O2 -Wall -D_GNU_SOURCE -L../src/
+
+all_targets += io_uring-test io_uring-cp
+
+all: $(all_targets)
+
+test_srcs := io_uring-test.c io_uring-cp.c
+
+test_objs := $(patsubst %.c,%.ol,$(test_srcs))
+
+io_uring-test: io_uring-test.c
+	$(CC) $(CFLAGS) -o $@ io_uring-test.c -luring
+io_uring-cp: io_uring-cp.c
+	$(CC) $(CFLAGS) -o $@ io_uring-cp.c -luring
+
+clean:
+	rm -f $(all_targets) $(test_objs)
diff --git a/test/io_uring-cp.c b/examples/io_uring-cp.c
similarity index 100%
rename from test/io_uring-cp.c
rename to examples/io_uring-cp.c
diff --git a/test/io_uring-test.c b/examples/io_uring-test.c
similarity index 100%
rename from test/io_uring-test.c
rename to examples/io_uring-test.c
diff --git a/test/Makefile b/test/Makefile
index 63bf67a..08b0c42 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,20 +1,15 @@
 CFLAGS ?= -g -O2 -Wall -D_GNU_SOURCE -L../src/
 
-all_targets += io_uring-test io_uring-cp poll poll-cancel ring-leak fsync \
-	io_uring_setup io_uring_register io_uring_enter nop sq-full cq-full
+all_targets += poll poll-cancel ring-leak fsync io_uring_setup io_uring_register \
+	       io_uring_enter nop sq-full cq-full
 
 all: $(all_targets)
 
-test_srcs := io_uring-test.c io_uring-cp.c poll.c poll-cancel.c ring-leak.c \
-	fsync.c io_uring_setup.c io_uring_register.c io_uring_enter.c nop.c \
-	sq-full.c cq-full.c
+test_srcs := poll.c poll-cancel.c ring-leak.c fsync.c io_uring_setup.c \
+	io_uring_register.c io_uring_enter.c nop.c sq-full.c cq-full.c
 
 test_objs := $(patsubst %.c,%.ol,$(test_srcs))
 
-io_uring-test: io_uring-test.c
-	$(CC) $(CFLAGS) -o $@ io_uring-test.c -luring
-io_uring-cp: io_uring-cp.c
-	$(CC) $(CFLAGS) -o $@ io_uring-cp.c -luring
 poll: poll.c
 	$(CC) $(CFLAGS) -o $@ poll.c -luring
 poll-cancel: poll-cancel.c
@@ -38,3 +33,6 @@ cq-full: cq-full.c
 
 clean:
 	rm -f $(all_targets) $(test_objs)
+
+runtests:
+	@./runtests.sh $(all_targets)