Simplify build for tests and gitignore cleanup
v2 cover Simplify build for tests and gitignore cleanup
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]
---
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
Signature · 1 line
Ammar Faizi
PATCH v2 1/3 test: Rename `[0-9a-f]-test.c` to `[0-9a-f].c`
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
---
.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%).gitignore +15 -15
@@ -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
test/232c93d07b74.c renamed from test/232c93d07b74-test.c +0 -0
test/35fa71a030ca.c renamed from test/35fa71a030ca-test.c +0 -0
test/500f9fbadef8.c renamed from test/500f9fbadef8-test.c +0 -0
test/7ad0e4b2f83c.c renamed from test/7ad0e4b2f83c-test.c +0 -0
test/8a9973408177.c renamed from test/8a9973408177-test.c +0 -0
test/917257daa0fe.c renamed from test/917257daa0fe-test.c +0 -0
test/Makefile +18 -18
@@ -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
test/a0908ae19763.c renamed from test/a0908ae19763-test.c +0 -0
test/a4c0b3decb33.c renamed from test/a4c0b3decb33-test.c +0 -0
test/b19062a56726.c renamed from test/b19062a56726-test.c +0 -0
test/b5837bd5311d.c renamed from test/b5837bd5311d-test.c +0 -0
test/ce593a6c480a.c renamed from test/ce593a6c480a-test.c +0 -0
test/d4ae271dfaae.c renamed from test/d4ae271dfaae-test.c +0 -0
test/d77a67ed5f27.c renamed from test/d77a67ed5f27-test.c +0 -0
test/eeed8b54e0df.c renamed from test/eeed8b54e0df-test.c +0 -0
test/fc2a85cb02ef.c renamed from test/fc2a85cb02ef-test.c +0 -0
Signature · 1 line
Ammar Faizi
PATCH v2 2/3 test/Makefile: Append `-lpthread` to `LDFLAGS` for all tests
In reply to Ammar FaiziInstead 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.
--- test/Makefile | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-)
test/Makefile +1 -23
@@ -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/
Signature · 1 line
Ammar Faizi
PATCH v2 3/3 test/Makefile: Append `.t` to the test binary
In reply to Ammar FaiziWhen 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.
--- .gitignore | 131 +------------------------------------------------- test/Makefile | 8 +-- 2 files changed, 6 insertions(+), 133 deletions(-)
.gitignore +1 -130
@@ -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/
test/Makefile +5 -3
@@ -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)
Signature · 1 line
Ammar Faizi
Jens Axboe
maintainerQuoted 10 lines · Ammar Faizi
Hi Jens,
This is the v2, there are 3 patches in this series:
- Rename
[0-9a-f]-test.cto[0-9a-f].c.- Append -lpthread for all tests and remove the LDFLAGS override for tests that use pthread.
- Append
.tto 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.
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerQuoted 7 lines · Jens Axboe
Quoted 6 lines · Ammar Faizi
Hi Jens,
This is the v2, there are 3 patches in this series:
- Rename
[0-9a-f]-test.cto[0-9a-f].c.
Quoted 8 lines
Quoted 4 lines
- Append -lpthread for all tests and remove the LDFLAGS override for tests that use pthread.
- Append
.tto 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.
Signature · 1 line
Jens Axboe
Quoted 8 lines · Ammar Faizi
This is the v2, there are 3 patches in this series:
- Rename
[0-9a-f]-test.cto[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: f200b5bba7017de7658bd44441322949182a4749Best regards,
Signature · 1 line
Jens Axboe