* [PATCH liburing v2] test/ringbuf-read: Delete `.ringbuf-read.%d` before exit
@ 2022-09-05 9:33 Ammar Faizi
2022-09-05 9:52 ` Alviro Iskandar Setiawan
2022-09-05 17:42 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Ammar Faizi @ 2022-09-05 9:33 UTC (permalink / raw)
To: Jens Axboe
Cc: Ammar Faizi, Pavel Begunkov, io-uring Mailing List,
GNU/Weeb Mailing List, Kanna Scarlet, Muhammad Rizki,
Alviro Iskandar Setiawan
From: Ammar Faizi <[email protected]>
Running test/ringbuf-read.t leaves untracked files in git status:
Untracked files:
(use "git add <file>..." to include in what will be committed)
.ringbuf-read.163521
.ringbuf-read.163564
.ringbuf-read.163605
.ringbuf-read.163648
Make sure we unlink it properly. While in there, fix the exit code,
use T_EXIT_*.
v2:
- Use T_EXIT_* for exit code (comment from Alviro).
Cc: Alviro Iskandar Setiawan <[email protected]>
Signed-off-by: Ammar Faizi <[email protected]>
---
test/ringbuf-read.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/test/ringbuf-read.c b/test/ringbuf-read.c
index 673f2de..8616a49 100644
--- a/test/ringbuf-read.c
+++ b/test/ringbuf-read.c
@@ -133,63 +133,68 @@ static int test(const char *filename, int dio, int async)
int main(int argc, char *argv[])
{
char buf[BUF_SIZE];
char fname[80];
int ret, fd, i, do_unlink;
if (argc > 1) {
strcpy(fname, argv[1]);
do_unlink = 0;
} else {
sprintf(fname, ".ringbuf-read.%d", getpid());
t_create_file(fname, FSIZE);
do_unlink = 1;
}
fd = open(fname, O_WRONLY);
if (fd < 0) {
perror("open");
goto err;
}
for (i = 0; i < NR_BUFS; i++) {
memset(buf, i + 1, BUF_SIZE);
ret = write(fd, buf, BUF_SIZE);
if (ret != BUF_SIZE) {
fprintf(stderr, "bad file prep write\n");
+ close(fd);
goto err;
}
}
close(fd);
ret = test(fname, 1, 0);
if (ret) {
fprintf(stderr, "dio test failed\n");
- return ret;
+ goto err;
}
if (no_buf_ring)
- return 0;
+ goto pass;
ret = test(fname, 0, 0);
if (ret) {
fprintf(stderr, "buffered test failed\n");
- return ret;
+ goto err;
}
ret = test(fname, 1, 1);
if (ret) {
fprintf(stderr, "dio async test failed\n");
- return ret;
+ goto err;
}
ret = test(fname, 0, 1);
if (ret) {
fprintf(stderr, "buffered async test failed\n");
- return ret;
+ goto err;
}
- return 0;
+pass:
+ ret = T_EXIT_PASS;
+ goto out;
err:
+ ret = T_EXIT_FAIL;
+out:
if (do_unlink)
unlink(fname);
- return 1;
+ return ret;
}
base-commit: 3bd7d6b27e6b7d7950bba1491bc9c385378fe4dd
--
Ammar Faizi
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH liburing v2] test/ringbuf-read: Delete `.ringbuf-read.%d` before exit
2022-09-05 9:33 [PATCH liburing v2] test/ringbuf-read: Delete `.ringbuf-read.%d` before exit Ammar Faizi
@ 2022-09-05 9:52 ` Alviro Iskandar Setiawan
2022-09-05 17:42 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Alviro Iskandar Setiawan @ 2022-09-05 9:52 UTC (permalink / raw)
To: Ammar Faizi
Cc: Jens Axboe, Pavel Begunkov, io-uring Mailing List,
GNU/Weeb Mailing List, Kanna Scarlet, Muhammad Rizki
On Mon, Sep 5, 2022 at 4:33 PM Ammar Faizi wrote:
> From: Ammar Faizi <[email protected]>
>
> Running test/ringbuf-read.t leaves untracked files in git status:
>
> Untracked files:
> (use "git add <file>..." to include in what will be committed)
> .ringbuf-read.163521
> .ringbuf-read.163564
> .ringbuf-read.163605
> .ringbuf-read.163648
>
> Make sure we unlink it properly. While in there, fix the exit code,
> use T_EXIT_*.
>
> v2:
> - Use T_EXIT_* for exit code (comment from Alviro).
>
> Cc: Alviro Iskandar Setiawan <[email protected]>
> Signed-off-by: Ammar Faizi <[email protected]>
Reviewed-by: Alviro Iskandar Setiawan <[email protected]>
tq
-- Viro
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH liburing v2] test/ringbuf-read: Delete `.ringbuf-read.%d` before exit
2022-09-05 9:33 [PATCH liburing v2] test/ringbuf-read: Delete `.ringbuf-read.%d` before exit Ammar Faizi
2022-09-05 9:52 ` Alviro Iskandar Setiawan
@ 2022-09-05 17:42 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2022-09-05 17:42 UTC (permalink / raw)
To: Ammar Faizi
Cc: io-uring Mailing List, GNU/Weeb Mailing List, Muhammad Rizki,
Kanna Scarlet, Pavel Begunkov, Alviro Iskandar Setiawan
On Mon, 5 Sep 2022 16:33:17 +0700, Ammar Faizi wrote:
> From: Ammar Faizi <[email protected]>
>
> Running test/ringbuf-read.t leaves untracked files in git status:
>
> Untracked files:
> (use "git add <file>..." to include in what will be committed)
> .ringbuf-read.163521
> .ringbuf-read.163564
> .ringbuf-read.163605
> .ringbuf-read.163648
>
> [...]
Applied, thanks!
[1/1] test/ringbuf-read: Delete `.ringbuf-read.%d` before exit
commit: 0535620c15e1133f9c19aefe9e928e0607e6c2b2
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-05 17:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-05 9:33 [PATCH liburing v2] test/ringbuf-read: Delete `.ringbuf-read.%d` before exit Ammar Faizi
2022-09-05 9:52 ` Alviro Iskandar Setiawan
2022-09-05 17:42 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox