This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit 2d2394201cde3e073fa059a0ac1536f5ad6243a9 Author: wangxingxing <[email protected]> AuthorDate: Fri Mar 21 14:27:17 2025 +0800 fs/bugfix: fix the fd error of fs test remove test_state of fs test cases Removes unnecessary test_state structure usage for tracking file descriptors Adds missing close(newfd) call in fs_dup_test.c to prevent file descriptor leaks Simplifies test code by eliminating redundant fd tracking that could lead to incorrect resource management Signed-off-by: wangxingxing <[email protected]> --- testing/testsuites/kernel/fs/cases/fs_dup_test.c | 6 +----- testing/testsuites/kernel/fs/cases/fs_file_get_test.c | 3 --- testing/testsuites/kernel/fs/cases/fs_poll_test.c | 5 ----- testing/testsuites/kernel/fs/cases/fs_readdir_test.c | 4 ---- testing/testsuites/kernel/fs/cases/fs_seek_test.c | 7 ------- testing/testsuites/kernel/fs/cases/fs_truncate_test.c | 5 ----- testing/testsuites/kernel/fs/cases/fs_unlink_test.c | 5 ----- testing/testsuites/kernel/fs/cases/fs_write_test.c | 8 -------- 8 files changed, 1 insertion(+), 42 deletions(-) diff --git a/testing/testsuites/kernel/fs/cases/fs_dup_test.c b/testing/testsuites/kernel/fs/cases/fs_dup_test.c index 0600041f1..91ebf23d7 100644 --- a/testing/testsuites/kernel/fs/cases/fs_dup_test.c +++ b/testing/testsuites/kernel/fs/cases/fs_dup_test.c @@ -60,15 +60,11 @@ void test_nuttx_fs_dup01(FAR void **state) char buffd[5] = "hello"; char bufnewfd[8] = "littleFS"; char readbuf[20] = ""; - struct fs_testsuites_state_s *test_state; - - test_state = (struct fs_testsuites_state_s *)*state; /* open file */ fd = open(TESTFILENAME, O_RDWR | O_CREAT | O_APPEND, 0700); assert_true(fd > 0); - test_state->fd1 = fd; /* do write */ @@ -83,7 +79,6 @@ void test_nuttx_fs_dup01(FAR void **state) newfd = dup(fd); close(fd); assert_int_not_equal(newfd, -1); - test_state->fd2 = newfd; /* check if file pos is shared */ @@ -112,4 +107,5 @@ void test_nuttx_fs_dup01(FAR void **state) /* check readbuf */ assert_int_equal(strncmp(readbuf, "hellolittleFS", 13), 0); + close(newfd); } diff --git a/testing/testsuites/kernel/fs/cases/fs_file_get_test.c b/testing/testsuites/kernel/fs/cases/fs_file_get_test.c index dd61c1f90..c06231f74 100644 --- a/testing/testsuites/kernel/fs/cases/fs_file_get_test.c +++ b/testing/testsuites/kernel/fs/cases/fs_file_get_test.c @@ -63,7 +63,6 @@ void test_nuttx_fs_file_get01(FAR void **state) fd = creat(TEST_FILE, 0700); assert_true(fd > 0); - test_state->fd1 = fd; /* fdopen file */ @@ -109,8 +108,6 @@ void test_nuttx_fs_file_get01(FAR void **state) assert_int_equal(filep->f_pos, BUF_SIZE); - test_state->fd2 = fileno(fp); - /* put filep */ file_put(filep); diff --git a/testing/testsuites/kernel/fs/cases/fs_poll_test.c b/testing/testsuites/kernel/fs/cases/fs_poll_test.c index c442c7437..e51ae9ee9 100644 --- a/testing/testsuites/kernel/fs/cases/fs_poll_test.c +++ b/testing/testsuites/kernel/fs/cases/fs_poll_test.c @@ -58,20 +58,15 @@ void test_nuttx_fs_poll01(FAR void **state) int poll01_fd2; int poll01_ret; struct pollfd poll01_fds[5]; - struct fs_testsuites_state_s *test_state; - - test_state = (struct fs_testsuites_state_s *)*state; poll01_fd1 = open(I_FILE1, O_RDONLY | O_CREAT); assert_true(poll01_fd1 >= 0); - test_state->fd1 = poll01_fd1; poll01_fds[0].fd = poll01_fd1; poll01_fds[0].events = POLLOUT; poll01_fd2 = open(I_FILE2, O_RDWR | O_CREAT); assert_true(poll01_fd2 >= 0); - test_state->fd2 = poll01_fd2; poll01_fds[1].fd = poll01_fd2; poll01_fds[1].events = POLLIN; diff --git a/testing/testsuites/kernel/fs/cases/fs_readdir_test.c b/testing/testsuites/kernel/fs/cases/fs_readdir_test.c index c5a259c5f..864f4ded0 100644 --- a/testing/testsuites/kernel/fs/cases/fs_readdir_test.c +++ b/testing/testsuites/kernel/fs/cases/fs_readdir_test.c @@ -65,9 +65,6 @@ void test_nuttx_fs_readdir01(FAR void **state) DIR *test_dir; struct dirent *dptr; - struct fs_testsuites_state_s *test_state; - - test_state = (struct fs_testsuites_state_s *)*state; for (int i = 0; i < 6; i++) { @@ -75,7 +72,6 @@ void test_nuttx_fs_readdir01(FAR void **state) fd = open(filename[i], O_RDWR | O_CREAT, 0700); assert_true(fd > 0); - test_state->fd1 = fd; /* do wirte */ diff --git a/testing/testsuites/kernel/fs/cases/fs_seek_test.c b/testing/testsuites/kernel/fs/cases/fs_seek_test.c index e206e5e0d..3a9206c37 100644 --- a/testing/testsuites/kernel/fs/cases/fs_seek_test.c +++ b/testing/testsuites/kernel/fs/cases/fs_seek_test.c @@ -57,15 +57,11 @@ void test_nuttx_fs_seek01(FAR void **state) char c[] = "This is fseek test !"; char buffer[sizeof(c)]; int ret; - struct fs_testsuites_state_s *test_state; - - test_state = (struct fs_testsuites_state_s *)*state; /* open file */ fp = fopen(TESTFILE, "w+"); assert_non_null(fp); - test_state->fd1 = fileno(fp); /* do fwrite */ @@ -251,11 +247,8 @@ static void test_nuttx_fs_clean(void) void test_nuttx_fs_seek02(FAR void **state) { int ret; - struct fs_testsuites_state_s *test_state; - test_state = (struct fs_testsuites_state_s *)*state; test_nuttx_fs_set(); - test_state->fd1 = fd; /* do verify lseek */ diff --git a/testing/testsuites/kernel/fs/cases/fs_truncate_test.c b/testing/testsuites/kernel/fs/cases/fs_truncate_test.c index ca2cef0bb..84e948bd5 100644 --- a/testing/testsuites/kernel/fs/cases/fs_truncate_test.c +++ b/testing/testsuites/kernel/fs/cases/fs_truncate_test.c @@ -59,9 +59,6 @@ void test_nuttx_fs_truncate01(FAR void **state) char buf[80]; const char *s1 = "0123456789"; const char *s2 = "abcde"; - struct fs_testsuites_state_s *test_state; - - test_state = (struct fs_testsuites_state_s *)*state; /* open file */ @@ -71,7 +68,6 @@ void test_nuttx_fs_truncate01(FAR void **state) #else assert_int_in_range(fd, 0, 512); #endif - test_state->fd1 = fd; /* do write */ @@ -104,7 +100,6 @@ void test_nuttx_fs_truncate01(FAR void **state) fd = open(TESTFILE, O_RDONLY); assert_true(fd > 0); - test_state->fd1 = fd; /* read file */ diff --git a/testing/testsuites/kernel/fs/cases/fs_unlink_test.c b/testing/testsuites/kernel/fs/cases/fs_unlink_test.c index 7d52eb425..d07c84b36 100644 --- a/testing/testsuites/kernel/fs/cases/fs_unlink_test.c +++ b/testing/testsuites/kernel/fs/cases/fs_unlink_test.c @@ -58,15 +58,10 @@ void test_nuttx_fs_unlink01(FAR void **state) { - struct fs_testsuites_state_s *test_state; - - test_state = (struct fs_testsuites_state_s *)*state; - /* open file */ int fd = open(test_file, O_RDWR | O_CREAT, 0777); assert_true(fd > 0); - test_state->fd1 = fd; char buf[MAXSIZE] = { diff --git a/testing/testsuites/kernel/fs/cases/fs_write_test.c b/testing/testsuites/kernel/fs/cases/fs_write_test.c index 75bbc96ef..5318acbe2 100644 --- a/testing/testsuites/kernel/fs/cases/fs_write_test.c +++ b/testing/testsuites/kernel/fs/cases/fs_write_test.c @@ -97,15 +97,11 @@ void test_nuttx_fs_write02(FAR void **state) FILE *fp; long offset; char content[15] = "asdfgtgtrf"; - struct fs_testsuites_state_s *test_state; - - test_state = (struct fs_testsuites_state_s *)*state; /* fopen file */ fp = fopen(TESTFILENAME, "a+"); assert_non_null(fp); - test_state->fd1 = fileno(fp); /* do fwrite */ @@ -147,15 +143,11 @@ void test_nuttx_fs_write03(FAR void **state) FILE *fp; long offset; char content[15] = "asdfgtgtrf"; - struct fs_testsuites_state_s *test_state; - - test_state = (struct fs_testsuites_state_s *)*state; /* fopen file */ fp = fopen(TESTFILENAME3, "a+"); assert_non_null(fp); - test_state->fd1 = fileno(fp); /* do fwrite */
