ostest: Skip test_dev_null when CONFIG_DEV_NULL isn't enabled

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-07-17 06:50:45 +08:00 committed by Masayuki Ishikawa
parent 1bc2e93124
commit ff276e422f
5 changed files with 16 additions and 5 deletions

View File

@ -22,13 +22,16 @@ if(CONFIG_TESTING_OSTEST)
set(SRCS set(SRCS
getopt.c getopt.c
dev_null.c
restart.c restart.c
sigprocmask.c sigprocmask.c
sighand.c sighand.c
signest.c signest.c
sighelper.c) sighelper.c)
if(CONFIG_DEV_NULL)
list(APPEND SRCS dev_null.c)
endif()
if(CONFIG_SIG_SIGSTOP_ACTION) if(CONFIG_SIG_SIGSTOP_ACTION)
if(CONFIG_SIG_SIGKILL_ACTION) if(CONFIG_SIG_SIGKILL_ACTION)
list(APPEND SRCS suspend.c) list(APPEND SRCS suspend.c)

View File

@ -29,10 +29,14 @@ MODULE = $(CONFIG_TESTING_OSTEST)
# NuttX OS Test # NuttX OS Test
CSRCS = getopt.c dev_null.c restart.c sigprocmask.c sighand.c signest.c CSRCS = getopt.c restart.c sigprocmask.c sighand.c signest.c
CSRCS += sighelper.c CSRCS += sighelper.c
MAINSRC = ostest_main.c MAINSRC = ostest_main.c
ifeq ($(CONFIG_DEV_NULL),y)
CSRCS += dev_null.c
endif
ifeq ($(CONFIG_SIG_SIGSTOP_ACTION),y) ifeq ($(CONFIG_SIG_SIGSTOP_ACTION),y)
ifeq ($(CONFIG_SIG_SIGKILL_ACTION),y) ifeq ($(CONFIG_SIG_SIGKILL_ACTION),y)
CSRCS += suspend.c CSRCS += suspend.c

View File

@ -41,7 +41,7 @@ static FAR char buffer[1024];
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
int dev_null(void) int dev_null_test(void)
{ {
int nbytes; int nbytes;
int fd; int fd;

View File

@ -99,7 +99,9 @@ int setvbuf_test(void);
/* dev_null.c ***************************************************************/ /* dev_null.c ***************************************************************/
int dev_null(void); #ifdef CONFIG_DEV_NULL
int dev_null_test(void);
#endif
/* fpu.c ********************************************************************/ /* fpu.c ********************************************************************/

View File

@ -325,9 +325,11 @@ static int user_main(int argc, char *argv[])
/* Checkout /dev/null */ /* Checkout /dev/null */
#ifdef CONFIG_DEV_NULL
printf("\nuser_main: /dev/null test\n"); printf("\nuser_main: /dev/null test\n");
dev_null(); dev_null_test();
check_test_memory_usage(); check_test_memory_usage();
#endif
#ifdef CONFIG_TESTING_OSTEST_AIO #ifdef CONFIG_TESTING_OSTEST_AIO
/* Check asynchronous I/O */ /* Check asynchronous I/O */