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 5d9d27d505156cbdb808012588561c8a0027986e Author: yangguangcai <[email protected]> AuthorDate: Wed Nov 29 20:14:30 2023 +0800 drivertest:fix compile error. arm-none-eabi-ld: /home/ygc/ssd/vela_n62_4.0/nuttx/staging/libapps.a(drivertest_watchdog.c.home.ygc.ssd.vela_n62_4.0.apps.testing.drivertest.o): in function `cmocka_driver_watchdog_main': /home/ygc/ssd/vela_n62_4.0/apps/testing/drivertest/drivertest_watchdog.c:480: multiple definition of `cmocka_driver_watchdog_main'; /home/ygc/ssd/vela_n62_4.0/nuttx/staging/libapps.a(drivertest_watchdog.c.home.ygc.ssd.vela_n62_4.0.apps.testing.drivertest.o):/home/ygc/ssd/vela_n62_4.0/apps/testing/drivertest/drivertest_watchdog.c:480: first defined here Signed-off-by: yangguangcai <[email protected]> --- testing/drivertest/Makefile | 5 ----- testing/drivertest/drivertest_oneshot.c | 3 +++ testing/drivertest/drivertest_posix_timer.c | 3 +++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/testing/drivertest/Makefile b/testing/drivertest/Makefile index dcb5fa266..1b7bc6345 100644 --- a/testing/drivertest/Makefile +++ b/testing/drivertest/Makefile @@ -71,11 +71,6 @@ MAINSRC += drivertest_pwm.c PROGNAME += cmocka_driver_pwm endif -ifneq ($(CONFIG_WATCHDOG),) -MAINSRC += drivertest_watchdog.c -PROGNAME += cmocka_driver_watchdog -endif - ifneq ($(CONFIG_ADC),) MAINSRC += drivertest_adc.c PROGNAME += cmocka_driver_adc diff --git a/testing/drivertest/drivertest_oneshot.c b/testing/drivertest/drivertest_oneshot.c index a86213840..6d190fe73 100644 --- a/testing/drivertest/drivertest_oneshot.c +++ b/testing/drivertest/drivertest_oneshot.c @@ -29,6 +29,9 @@ #include <stdlib.h> #include <unistd.h> #include <setjmp.h> +#include <stdarg.h> +#include <stddef.h> +#include <stdint.h> #include <cmocka.h> #include <sys/ioctl.h> #include <sys/types.h> diff --git a/testing/drivertest/drivertest_posix_timer.c b/testing/drivertest/drivertest_posix_timer.c index 5ab5ac02f..5fc2092f8 100644 --- a/testing/drivertest/drivertest_posix_timer.c +++ b/testing/drivertest/drivertest_posix_timer.c @@ -26,6 +26,9 @@ #include <signal.h> #include <setjmp.h> #include <stdlib.h> +#include <stdarg.h> +#include <stddef.h> +#include <stdint.h> #include <cmocka.h> #include <syslog.h> #include <nuttx/timers/timer.h>
