* [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup
@ 2022-04-03 18:21 Ammar Faizi
2022-04-03 18:21 ` [PATCH liburing v2 1/3] test: Rename `[0-9a-f]-test.c` to `[0-9a-f].c` Ammar Faizi
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Ammar Faizi @ 2022-04-03 18:21 UTC (permalink / raw)
To: Jens Axboe; +Cc: Ammar Faizi, io-uring Mailing List, GNU/Weeb Mailing List
Hi Jens,
This is the v2, there are 3 patches in this series:
- Rename `[0-9a-f]-test.c` to `[0-9a-f].c`.
- Append -lpthread for all tests and remove the LDFLAGS override
for tests that use pthread.
- Append `.t` to the test binary filename for gitignore simplification.
## Changelog
v2:
- Rename `[0-9a-f]-test.c` to `[0-9a-f].c`.
- Append `.t` instead of `.test`.
Link v1: https://lore.kernel.org/io-uring/[email protected]
Signed-off-by: Ammar Faizi <[email protected]>
---
Ammar Faizi (3):
test: Rename `[0-9a-f]-test.c` to `[0-9a-f].c`
test/Makefile: Append -lpthread for all tests
test/Makefile: Append `.t` to the test binary
.gitignore | 131 +------------------
test/{232c93d07b74-test.c => 232c93d07b74.c} | 0
test/{35fa71a030ca-test.c => 35fa71a030ca.c} | 0
test/{500f9fbadef8-test.c => 500f9fbadef8.c} | 0
test/{7ad0e4b2f83c-test.c => 7ad0e4b2f83c.c} | 0
test/{8a9973408177-test.c => 8a9973408177.c} | 0
test/{917257daa0fe-test.c => 917257daa0fe.c} | 0
test/Makefile | 62 +++------
test/{a0908ae19763-test.c => a0908ae19763.c} | 0
test/{a4c0b3decb33-test.c => a4c0b3decb33.c} | 0
test/{b19062a56726-test.c => b19062a56726.c} | 0
test/{b5837bd5311d-test.c => b5837bd5311d.c} | 0
test/{ce593a6c480a-test.c => ce593a6c480a.c} | 0
test/{d4ae271dfaae-test.c => d4ae271dfaae.c} | 0
test/{d77a67ed5f27-test.c => d77a67ed5f27.c} | 0
test/{eeed8b54e0df-test.c => eeed8b54e0df.c} | 0
test/{fc2a85cb02ef-test.c => fc2a85cb02ef.c} | 0
17 files changed, 22 insertions(+), 171 deletions(-)
rename test/{232c93d07b74-test.c => 232c93d07b74.c} (100%)
rename test/{35fa71a030ca-test.c => 35fa71a030ca.c} (100%)
rename test/{500f9fbadef8-test.c => 500f9fbadef8.c} (100%)
rename test/{7ad0e4b2f83c-test.c => 7ad0e4b2f83c.c} (100%)
rename test/{8a9973408177-test.c => 8a9973408177.c} (100%)
rename test/{917257daa0fe-test.c => 917257daa0fe.c} (100%)
rename test/{a0908ae19763-test.c => a0908ae19763.c} (100%)
rename test/{a4c0b3decb33-test.c => a4c0b3decb33.c} (100%)
rename test/{b19062a56726-test.c => b19062a56726.c} (100%)
rename test/{b5837bd5311d-test.c => b5837bd5311d.c} (100%)
rename test/{ce593a6c480a-test.c => ce593a6c480a.c} (100%)
rename test/{d4ae271dfaae-test.c => d4ae271dfaae.c} (100%)
rename test/{d77a67ed5f27-test.c => d77a67ed5f27.c} (100%)
rename test/{eeed8b54e0df-test.c => eeed8b54e0df.c} (100%)
rename test/{fc2a85cb02ef-test.c => fc2a85cb02ef.c} (100%)
base-commit: 314dd7ba2aa9d0ba5bb9a6ab28b7204dd319e386
--
Ammar Faizi
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH liburing v2 1/3] test: Rename `[0-9a-f]-test.c` to `[0-9a-f].c`
2022-04-03 18:21 [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Ammar Faizi
@ 2022-04-03 18:21 ` Ammar Faizi
2022-04-03 18:21 ` [PATCH liburing v2 2/3] test/Makefile: Append `-lpthread` to `LDFLAGS` for all tests Ammar Faizi
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Ammar Faizi @ 2022-04-03 18:21 UTC (permalink / raw)
To: Jens Axboe; +Cc: Ammar Faizi, io-uring Mailing List, GNU/Weeb Mailing List
Simplify the test filename.
mv -v test/232c93d07b74-test.c test/232c93d07b74.c
mv -v test/35fa71a030ca-test.c test/35fa71a030ca.c
mv -v test/500f9fbadef8-test.c test/500f9fbadef8.c
mv -v test/7ad0e4b2f83c-test.c test/7ad0e4b2f83c.c
mv -v test/8a9973408177-test.c test/8a9973408177.c
mv -v test/917257daa0fe-test.c test/917257daa0fe.c
mv -v test/a0908ae19763-test.c test/a0908ae19763.c
mv -v test/a4c0b3decb33-test.c test/a4c0b3decb33.c
mv -v test/b19062a56726-test.c test/b19062a56726.c
mv -v test/b5837bd5311d-test.c test/b5837bd5311d.c
mv -v test/ce593a6c480a-test.c test/ce593a6c480a.c
mv -v test/d4ae271dfaae-test.c test/d4ae271dfaae.c
mv -v test/d77a67ed5f27-test.c test/d77a67ed5f27.c
mv -v test/eeed8b54e0df-test.c test/eeed8b54e0df.c
mv -v test/fc2a85cb02ef-test.c test/fc2a85cb02ef.c
Signed-off-by: Ammar Faizi <[email protected]>
---
.gitignore | 30 ++++++++--------
test/{232c93d07b74-test.c => 232c93d07b74.c} | 0
test/{35fa71a030ca-test.c => 35fa71a030ca.c} | 0
test/{500f9fbadef8-test.c => 500f9fbadef8.c} | 0
test/{7ad0e4b2f83c-test.c => 7ad0e4b2f83c.c} | 0
test/{8a9973408177-test.c => 8a9973408177.c} | 0
test/{917257daa0fe-test.c => 917257daa0fe.c} | 0
test/Makefile | 36 ++++++++++----------
test/{a0908ae19763-test.c => a0908ae19763.c} | 0
test/{a4c0b3decb33-test.c => a4c0b3decb33.c} | 0
test/{b19062a56726-test.c => b19062a56726.c} | 0
test/{b5837bd5311d-test.c => b5837bd5311d.c} | 0
test/{ce593a6c480a-test.c => ce593a6c480a.c} | 0
test/{d4ae271dfaae-test.c => d4ae271dfaae.c} | 0
test/{d77a67ed5f27-test.c => d77a67ed5f27.c} | 0
test/{eeed8b54e0df-test.c => eeed8b54e0df.c} | 0
test/{fc2a85cb02ef-test.c => fc2a85cb02ef.c} | 0
17 files changed, 33 insertions(+), 33 deletions(-)
rename test/{232c93d07b74-test.c => 232c93d07b74.c} (100%)
rename test/{35fa71a030ca-test.c => 35fa71a030ca.c} (100%)
rename test/{500f9fbadef8-test.c => 500f9fbadef8.c} (100%)
rename test/{7ad0e4b2f83c-test.c => 7ad0e4b2f83c.c} (100%)
rename test/{8a9973408177-test.c => 8a9973408177.c} (100%)
rename test/{917257daa0fe-test.c => 917257daa0fe.c} (100%)
rename test/{a0908ae19763-test.c => a0908ae19763.c} (100%)
rename test/{a4c0b3decb33-test.c => a4c0b3decb33.c} (100%)
rename test/{b19062a56726-test.c => b19062a56726.c} (100%)
rename test/{b5837bd5311d-test.c => b5837bd5311d.c} (100%)
rename test/{ce593a6c480a-test.c => ce593a6c480a.c} (100%)
rename test/{d4ae271dfaae-test.c => d4ae271dfaae.c} (100%)
rename test/{d77a67ed5f27-test.c => d77a67ed5f27.c} (100%)
rename test/{eeed8b54e0df-test.c => eeed8b54e0df.c} (100%)
rename test/{fc2a85cb02ef-test.c => fc2a85cb02ef.c} (100%)
diff --git a/.gitignore b/.gitignore
index 4a6e585..58fff7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,22 +16,22 @@
/examples/link-cp
/examples/ucontext-cp
-/test/232c93d07b74-test
-/test/35fa71a030ca-test
-/test/500f9fbadef8-test
-/test/7ad0e4b2f83c-test
-/test/8a9973408177-test
-/test/917257daa0fe-test
-/test/a0908ae19763-test
-/test/a4c0b3decb33-test
+/test/232c93d07b74
+/test/35fa71a030ca
+/test/500f9fbadef8
+/test/7ad0e4b2f83c
+/test/8a9973408177
+/test/917257daa0fe
+/test/a0908ae19763
+/test/a4c0b3decb33
/test/accept
/test/accept-link
/test/accept-reuse
/test/accept-test
/test/across-fork
-/test/b19062a56726-test
-/test/b5837bd5311d-test
-/test/ce593a6c480a-test
+/test/b19062a56726
+/test/b5837bd5311d
+/test/ce593a6c480a
/test/close-opath
/test/config.local
/test/connect
@@ -41,12 +41,12 @@
/test/cq-peek-batch
/test/cq-ready
/test/cq-size
-/test/d4ae271dfaae-test
-/test/d77a67ed5f27-test
+/test/d4ae271dfaae
+/test/d77a67ed5f27
/test/defer
/test/double-poll-crash
/test/drop-submit
-/test/eeed8b54e0df-test
+/test/eeed8b54e0df
/test/empty-eownerdead
/test/eventfd
/test/eventfd-disable
@@ -55,7 +55,7 @@
/test/exit-no-cleanup
/test/fadvise
/test/fallocate
-/test/fc2a85cb02ef-test
+/test/fc2a85cb02ef
/test/file-register
/test/file-update
/test/file-verify
diff --git a/test/232c93d07b74-test.c b/test/232c93d07b74.c
similarity index 100%
rename from test/232c93d07b74-test.c
rename to test/232c93d07b74.c
diff --git a/test/35fa71a030ca-test.c b/test/35fa71a030ca.c
similarity index 100%
rename from test/35fa71a030ca-test.c
rename to test/35fa71a030ca.c
diff --git a/test/500f9fbadef8-test.c b/test/500f9fbadef8.c
similarity index 100%
rename from test/500f9fbadef8-test.c
rename to test/500f9fbadef8.c
diff --git a/test/7ad0e4b2f83c-test.c b/test/7ad0e4b2f83c.c
similarity index 100%
rename from test/7ad0e4b2f83c-test.c
rename to test/7ad0e4b2f83c.c
diff --git a/test/8a9973408177-test.c b/test/8a9973408177.c
similarity index 100%
rename from test/8a9973408177-test.c
rename to test/8a9973408177.c
diff --git a/test/917257daa0fe-test.c b/test/917257daa0fe.c
similarity index 100%
rename from test/917257daa0fe-test.c
rename to test/917257daa0fe.c
diff --git a/test/Makefile b/test/Makefile
index 1526776..44a96b2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -34,22 +34,22 @@ LDFLAGS ?=
override LDFLAGS += -L../src/ -luring
test_srcs := \
- 232c93d07b74-test.c \
- 35fa71a030ca-test.c \
- 500f9fbadef8-test.c \
- 7ad0e4b2f83c-test.c \
- 8a9973408177-test.c \
- 917257daa0fe-test.c \
- a0908ae19763-test.c \
- a4c0b3decb33-test.c \
+ 232c93d07b74.c \
+ 35fa71a030ca.c \
+ 500f9fbadef8.c \
+ 7ad0e4b2f83c.c \
+ 8a9973408177.c \
+ 917257daa0fe.c \
+ a0908ae19763.c \
+ a4c0b3decb33.c \
accept.c \
accept-link.c \
accept-reuse.c \
accept-test.c \
across-fork.c \
- b19062a56726-test.c \
- b5837bd5311d-test.c \
- ce593a6c480a-test.c \
+ b19062a56726.c \
+ b5837bd5311d.c \
+ ce593a6c480a.c \
close-opath.c \
connect.c \
cq-full.c \
@@ -57,12 +57,12 @@ test_srcs := \
cq-peek-batch.c \
cq-ready.c \
cq-size.c \
- d4ae271dfaae-test.c \
- d77a67ed5f27-test.c \
+ d4ae271dfaae.c \
+ d77a67ed5f27.c \
defer.c \
double-poll-crash.c \
drop-submit.c \
- eeed8b54e0df-test.c \
+ eeed8b54e0df.c \
empty-eownerdead.c \
eventfd.c \
eventfd-disable.c \
@@ -72,7 +72,7 @@ test_srcs := \
exit-no-cleanup.c \
fadvise.c \
fallocate.c \
- fc2a85cb02ef-test.c \
+ fc2a85cb02ef.c \
file-register.c \
files-exit-hang-poll.c \
files-exit-hang-timeout.c \
@@ -211,8 +211,8 @@ helpers.o: helpers.c
$(QUIET_CXX)$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $< $(helpers) $(LDFLAGS)
-35fa71a030ca-test: override LDFLAGS += -lpthread
-232c93d07b74-test: override LDFLAGS += -lpthread
+35fa71a030ca: override LDFLAGS += -lpthread
+232c93d07b74: override LDFLAGS += -lpthread
send_recv: override LDFLAGS += -lpthread
send_recvmsg: override LDFLAGS += -lpthread
poll-link: override LDFLAGS += -lpthread
@@ -220,7 +220,7 @@ accept-link: override LDFLAGS += -lpthread
submit-reuse: override LDFLAGS += -lpthread
poll-v-poll: override LDFLAGS += -lpthread
across-fork: override LDFLAGS += -lpthread
-ce593a6c480a-test: override LDFLAGS += -lpthread
+ce593a6c480a: override LDFLAGS += -lpthread
wakeup-hang: override LDFLAGS += -lpthread
pipe-eof: override LDFLAGS += -lpthread
timeout-new: override LDFLAGS += -lpthread
diff --git a/test/a0908ae19763-test.c b/test/a0908ae19763.c
similarity index 100%
rename from test/a0908ae19763-test.c
rename to test/a0908ae19763.c
diff --git a/test/a4c0b3decb33-test.c b/test/a4c0b3decb33.c
similarity index 100%
rename from test/a4c0b3decb33-test.c
rename to test/a4c0b3decb33.c
diff --git a/test/b19062a56726-test.c b/test/b19062a56726.c
similarity index 100%
rename from test/b19062a56726-test.c
rename to test/b19062a56726.c
diff --git a/test/b5837bd5311d-test.c b/test/b5837bd5311d.c
similarity index 100%
rename from test/b5837bd5311d-test.c
rename to test/b5837bd5311d.c
diff --git a/test/ce593a6c480a-test.c b/test/ce593a6c480a.c
similarity index 100%
rename from test/ce593a6c480a-test.c
rename to test/ce593a6c480a.c
diff --git a/test/d4ae271dfaae-test.c b/test/d4ae271dfaae.c
similarity index 100%
rename from test/d4ae271dfaae-test.c
rename to test/d4ae271dfaae.c
diff --git a/test/d77a67ed5f27-test.c b/test/d77a67ed5f27.c
similarity index 100%
rename from test/d77a67ed5f27-test.c
rename to test/d77a67ed5f27.c
diff --git a/test/eeed8b54e0df-test.c b/test/eeed8b54e0df.c
similarity index 100%
rename from test/eeed8b54e0df-test.c
rename to test/eeed8b54e0df.c
diff --git a/test/fc2a85cb02ef-test.c b/test/fc2a85cb02ef.c
similarity index 100%
rename from test/fc2a85cb02ef-test.c
rename to test/fc2a85cb02ef.c
--
Ammar Faizi
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH liburing v2 2/3] test/Makefile: Append `-lpthread` to `LDFLAGS` for all tests
2022-04-03 18:21 [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Ammar Faizi
2022-04-03 18:21 ` [PATCH liburing v2 1/3] test: Rename `[0-9a-f]-test.c` to `[0-9a-f].c` Ammar Faizi
@ 2022-04-03 18:21 ` Ammar Faizi
2022-04-03 18:22 ` [PATCH liburing v2 3/3] test/Makefile: Append `.t` to the test binary Ammar Faizi
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Ammar Faizi @ 2022-04-03 18:21 UTC (permalink / raw)
To: Jens Axboe; +Cc: Ammar Faizi, io-uring Mailing List, GNU/Weeb Mailing List
Instead of overriding LDFLAGS one by one for tests that need pthread,
append -lpthread to LDFLAGS for all tests. This makes the Makefile
script simpler. It also saves some hassle when we add a new test
that does use pthread.
Signed-off-by: Ammar Faizi <[email protected]>
---
test/Makefile | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/test/Makefile b/test/Makefile
index 44a96b2..eb1e7d5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -31,7 +31,7 @@ override CFLAGS += $(XCFLAGS) -DLIBURING_BUILD_TEST
override CXXFLAGS += $(XCFLAGS) -std=c++11 -DLIBURING_BUILD_TEST
LDFLAGS ?=
-override LDFLAGS += -L../src/ -luring
+override LDFLAGS += -L../src/ -luring -lpthread
test_srcs := \
232c93d07b74.c \
@@ -211,28 +211,6 @@ helpers.o: helpers.c
$(QUIET_CXX)$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $< $(helpers) $(LDFLAGS)
-35fa71a030ca: override LDFLAGS += -lpthread
-232c93d07b74: override LDFLAGS += -lpthread
-send_recv: override LDFLAGS += -lpthread
-send_recvmsg: override LDFLAGS += -lpthread
-poll-link: override LDFLAGS += -lpthread
-accept-link: override LDFLAGS += -lpthread
-submit-reuse: override LDFLAGS += -lpthread
-poll-v-poll: override LDFLAGS += -lpthread
-across-fork: override LDFLAGS += -lpthread
-ce593a6c480a: override LDFLAGS += -lpthread
-wakeup-hang: override LDFLAGS += -lpthread
-pipe-eof: override LDFLAGS += -lpthread
-timeout-new: override LDFLAGS += -lpthread
-thread-exit: override LDFLAGS += -lpthread
-ring-leak2: override LDFLAGS += -lpthread
-poll-mshot-update: override LDFLAGS += -lpthread
-exit-no-cleanup: override LDFLAGS += -lpthread
-pollfree: override LDFLAGS += -lpthread
-msg-ring: override LDFLAGS += -lpthread
-recv-msgall: override LDFLAGS += -lpthread
-recv-msgall-stream: override LDFLAGS += -lpthread
-
install: $(test_targets) runtests.sh runtests-loop.sh
$(INSTALL) -D -d -m 755 $(datadir)/liburing-test/
$(INSTALL) -D -m 755 $(test_targets) $(datadir)/liburing-test/
--
Ammar Faizi
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH liburing v2 3/3] test/Makefile: Append `.t` to the test binary
2022-04-03 18:21 [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Ammar Faizi
2022-04-03 18:21 ` [PATCH liburing v2 1/3] test: Rename `[0-9a-f]-test.c` to `[0-9a-f].c` Ammar Faizi
2022-04-03 18:21 ` [PATCH liburing v2 2/3] test/Makefile: Append `-lpthread` to `LDFLAGS` for all tests Ammar Faizi
@ 2022-04-03 18:22 ` Ammar Faizi
2022-04-03 23:15 ` [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Jens Axboe
2022-04-03 23:17 ` Jens Axboe
4 siblings, 0 replies; 7+ messages in thread
From: Ammar Faizi @ 2022-04-03 18:22 UTC (permalink / raw)
To: Jens Axboe; +Cc: Ammar Faizi, io-uring Mailing List, GNU/Weeb Mailing List
When adding a new test, we often forget to add the new test binary to
`.gitignore`. Append `.t` to the test binary filename, this way we can
use a wildcard matching "test/*.t" in `.gitignore` to ignore all
test binary files.
Goals:
- Make the .gitignore simpler.
- Avoid the burden of adding a new test to .gitignore.
Signed-off-by: Ammar Faizi <[email protected]>
---
.gitignore | 131 +-------------------------------------------------
test/Makefile | 8 +--
2 files changed, 6 insertions(+), 133 deletions(-)
diff --git a/.gitignore b/.gitignore
index 58fff7f..60fddd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,136 +16,7 @@
/examples/link-cp
/examples/ucontext-cp
-/test/232c93d07b74
-/test/35fa71a030ca
-/test/500f9fbadef8
-/test/7ad0e4b2f83c
-/test/8a9973408177
-/test/917257daa0fe
-/test/a0908ae19763
-/test/a4c0b3decb33
-/test/accept
-/test/accept-link
-/test/accept-reuse
-/test/accept-test
-/test/across-fork
-/test/b19062a56726
-/test/b5837bd5311d
-/test/ce593a6c480a
-/test/close-opath
-/test/config.local
-/test/connect
-/test/cq-full
-/test/cq-overflow
-/test/cq-overflow-peek
-/test/cq-peek-batch
-/test/cq-ready
-/test/cq-size
-/test/d4ae271dfaae
-/test/d77a67ed5f27
-/test/defer
-/test/double-poll-crash
-/test/drop-submit
-/test/eeed8b54e0df
-/test/empty-eownerdead
-/test/eventfd
-/test/eventfd-disable
-/test/eventfd-reg
-/test/eventfd-ring
-/test/exit-no-cleanup
-/test/fadvise
-/test/fallocate
-/test/fc2a85cb02ef
-/test/file-register
-/test/file-update
-/test/file-verify
-/test/files-exit-hang-poll
-/test/files-exit-hang-timeout
-/test/fixed-buf-iter
-/test/fixed-link
-/test/fixed-reuse
-/test/fpos
-/test/fsync
-/test/hardlink
-/test/io-cancel
-/test/io_uring_enter
-/test/io_uring_register
-/test/io_uring_setup
-/test/iopoll
-/test/lfs-openat
-/test/lfs-openat-write
-/test/link
-/test/link-timeout
-/test/link_drain
-/test/madvise
-/test/mkdir
-/test/msg-ring
-/test/nop
-/test/nop-all-sizes
-/test/open-close
-/test/open-direct-link
-/test/openat2
-/test/personality
-/test/pipe-eof
-/test/pipe-reuse
-/test/poll
-/test/poll-cancel
-/test/poll-cancel-ton
-/test/poll-link
-/test/poll-many
-/test/poll-ring
-/test/poll-v-poll
-/test/pollfree
-/test/probe
-/test/read-write
-/test/recv-msgall
-/test/recv-msgall-stream
-/test/register-restrictions
-/test/rename
-/test/ring-leak
-/test/ring-leak2
-/test/self
-/test/send_recv
-/test/send_recvmsg
-/test/sendmsg_fs_cve
-/test/shared-wq
-/test/short-read
-/test/shutdown
-/test/sigfd-deadlock
-/test/socket-rw
-/test/socket-rw-eagain
-/test/socket-rw-offset
-/test/splice
-/test/sq-full
-/test/sq-full-cpp
-/test/sq-poll-dup
-/test/sq-poll-kthread
-/test/sq-poll-share
-/test/sqpoll-disable-exit
-/test/sqpoll-exit-hang
-/test/sqpoll-sleep
-/test/sq-space_left
-/test/statx
-/test/stdout
-/test/submit-reuse
-/test/symlink
-/test/teardowns
-/test/thread-exit
-/test/timeout
-/test/timeout-new
-/test/timeout-overflow
-/test/tty-write-dpoll
-/test/unlink
-/test/wakeup-hang
-/test/multicqes_drain
-/test/poll-mshot-update
-/test/rsrc_tags
-/test/rw_merge_test
-/test/sqpoll-cancel-hang
-/test/testfile
-/test/submit-link-fail
-/test/exec-target
-/test/skip-cqe
+/test/*.t
/test/*.dmesg
/test/output/
diff --git a/test/Makefile b/test/Makefile
index eb1e7d5..d97341c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -183,7 +183,9 @@ endif
all_targets += sq-full-cpp
-test_targets := $(patsubst %.c,%,$(patsubst %.cc,%,$(test_srcs)))
+test_targets := $(patsubst %.c,%,$(test_srcs))
+test_targets := $(patsubst %.cc,%,$(test_targets))
+test_targets := $(patsubst %,%.t,$(test_targets))
all_targets += $(test_targets)
#
@@ -204,10 +206,10 @@ all: $(test_targets)
helpers.o: helpers.c
$(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
-%: %.c $(helpers) helpers.h ../src/liburing.a
+%.t: %.c $(helpers) helpers.h ../src/liburing.a
$(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< $(helpers) $(LDFLAGS)
-%: %.cc $(helpers) helpers.h ../src/liburing.a
+%.t: %.cc $(helpers) helpers.h ../src/liburing.a
$(QUIET_CXX)$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $< $(helpers) $(LDFLAGS)
--
Ammar Faizi
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup
2022-04-03 18:21 [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Ammar Faizi
` (2 preceding siblings ...)
2022-04-03 18:22 ` [PATCH liburing v2 3/3] test/Makefile: Append `.t` to the test binary Ammar Faizi
@ 2022-04-03 23:15 ` Jens Axboe
2022-04-03 23:20 ` Jens Axboe
2022-04-03 23:17 ` Jens Axboe
4 siblings, 1 reply; 7+ messages in thread
From: Jens Axboe @ 2022-04-03 23:15 UTC (permalink / raw)
To: Ammar Faizi; +Cc: io-uring Mailing List, GNU/Weeb Mailing List
On 4/3/22 12:21 PM, Ammar Faizi wrote:
> Hi Jens,
>
> This is the v2, there are 3 patches in this series:
>
> - Rename `[0-9a-f]-test.c` to `[0-9a-f].c`.
>
> - Append -lpthread for all tests and remove the LDFLAGS override
> for tests that use pthread.
>
> - Append `.t` to the test binary filename for gitignore simplification.
Thanks - I have applied this series, but noticed that test/statx.t isn't
properly cleaned when make clean is run. If you have time, please take
a look. If not I will tomorrow.
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup
2022-04-03 18:21 [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Ammar Faizi
` (3 preceding siblings ...)
2022-04-03 23:15 ` [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Jens Axboe
@ 2022-04-03 23:17 ` Jens Axboe
4 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2022-04-03 23:17 UTC (permalink / raw)
To: Ammar Faizi; +Cc: GNU/Weeb Mailing List, io-uring Mailing List
On Mon, 4 Apr 2022 01:21:57 +0700, Ammar Faizi wrote:
> This is the v2, there are 3 patches in this series:
>
> - Rename `[0-9a-f]-test.c` to `[0-9a-f].c`.
>
> - Append -lpthread for all tests and remove the LDFLAGS override
> for tests that use pthread.
>
> [...]
Applied, thanks!
[1/3] test: Rename `[0-9a-f]-test.c` to `[0-9a-f].c`
commit: 20b5edad904af8873ed06f683dee6dbfb05d9fcb
[2/3] test/Makefile: Append `-lpthread` to `LDFLAGS` for all tests
commit: 664bf782a6d78f701301ef6ebdd7cf63b2e3ee09
[3/3] test/Makefile: Append `.t` to the test binary
commit: f200b5bba7017de7658bd44441322949182a4749
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup
2022-04-03 23:15 ` [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Jens Axboe
@ 2022-04-03 23:20 ` Jens Axboe
0 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2022-04-03 23:20 UTC (permalink / raw)
To: Ammar Faizi; +Cc: io-uring Mailing List, GNU/Weeb Mailing List
On 4/3/22 5:15 PM, Jens Axboe wrote:
> On 4/3/22 12:21 PM, Ammar Faizi wrote:
>> Hi Jens,
>>
>> This is the v2, there are 3 patches in this series:
>>
>> - Rename `[0-9a-f]-test.c` to `[0-9a-f].c`.
>>
>> - Append -lpthread for all tests and remove the LDFLAGS override
>> for tests that use pthread.
>>
>> - Append `.t` to the test binary filename for gitignore simplification.
>
> Thanks - I have applied this series, but noticed that test/statx.t isn't
> properly cleaned when make clean is run. If you have time, please take
> a look. If not I will tomorrow.
It was pretty trivial, I fixed it up.
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-04-03 23:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-03 18:21 [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Ammar Faizi
2022-04-03 18:21 ` [PATCH liburing v2 1/3] test: Rename `[0-9a-f]-test.c` to `[0-9a-f].c` Ammar Faizi
2022-04-03 18:21 ` [PATCH liburing v2 2/3] test/Makefile: Append `-lpthread` to `LDFLAGS` for all tests Ammar Faizi
2022-04-03 18:22 ` [PATCH liburing v2 3/3] test/Makefile: Append `.t` to the test binary Ammar Faizi
2022-04-03 23:15 ` [PATCH liburing v2 0/3] Simplify build for tests and gitignore cleanup Jens Axboe
2022-04-03 23:20 ` Jens Axboe
2022-04-03 23:17 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox