diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/commands01/test_main.c | 15 | ||||
| -rw-r--r-- | testsuite/include/rtems/bsd/test/default-network-init.h | 19 | ||||
| -rw-r--r-- | testsuite/media01/test_main.c | 13 |
3 files changed, 41 insertions, 6 deletions
diff --git a/testsuite/commands01/test_main.c b/testsuite/commands01/test_main.c index f0ddab50..2e61a933 100644 --- a/testsuite/commands01/test_main.c +++ b/testsuite/commands01/test_main.c @@ -40,6 +40,7 @@ #include <machine/rtems-bsd-commands.h> #include <rtems/libcsupport.h> +#include <rtems/bsd/modules.h> #define TEST_NAME "LIBBSD COMMANDS 1" @@ -108,6 +109,7 @@ test_ifconfig_lo0(void) "255.255.255.0", NULL }; +#ifdef RTEMS_BSD_MODULE_NETINET6 char *lo0_inet6[] = { "ifconfig", "lo0", @@ -117,37 +119,46 @@ test_ifconfig_lo0(void) "128", NULL }; +#endif /* RTEMS_BSD_MODULE_NETINET6 */ char *status[] = { "ifconfig", "lo0", "inet", NULL }; +#ifdef RTEMS_BSD_MODULE_NETINET6 char *status_inet6[] = { "ifconfig", "lo0", "inet6", NULL }; +#endif /* RTEMS_BSD_MODULE_NETINET6 */ exit_code = rtems_bsd_command_ifconfig(ARGC(lo0), lo0); assert(exit_code == EX_OK); +#ifdef RTEMS_BSD_MODULE_NETINET6 exit_code = rtems_bsd_command_ifconfig(ARGC(lo0_inet6), lo0_inet6); assert(exit_code == EX_OK); +#endif /* RTEMS_BSD_MODULE_NETINET6 */ rtems_resource_snapshot_take(&snapshot); exit_code = rtems_bsd_command_ifconfig(ARGC(status), status); assert(exit_code == EX_OK); +#ifdef RTEMS_BSD_MODULE_NETINET6 exit_code = rtems_bsd_command_ifconfig(ARGC(status_inet6), status_inet6); assert(exit_code == EX_OK); +#endif /* RTEMS_BSD_MODULE_NETINET6 */ rtems_resource_snapshot_take(&snapshot); +#ifdef RTEMS_BSD_MODULE_NETINET6 exit_code = rtems_bsd_command_ifconfig(ARGC(status_inet6), status_inet6); assert(exit_code == EX_OK); +#endif /* RTEMS_BSD_MODULE_NETINET6 */ assert(rtems_resource_snapshot_check(&snapshot)); } @@ -195,6 +206,7 @@ test_ping(void) static void test_ping6(void) { +#ifdef RTEMS_BSD_MODULE_NETINET6 rtems_resource_snapshot snapshot; int exit_code; char *ping6[] = { @@ -214,6 +226,7 @@ test_ping6(void) assert(exit_code == EXIT_SUCCESS); assert(rtems_resource_snapshot_check(&snapshot)); +#endif } static void @@ -260,6 +273,7 @@ test_netstat(void) static void test_wlanstats(void) { +#ifdef RTEMS_BSD_MODULE_USER_SPACE_WLANSTATS rtems_resource_snapshot snapshot; char *wlanstats[] = { "wlanstats", @@ -271,6 +285,7 @@ test_wlanstats(void) rtems_resource_snapshot_take(&snapshot); rtems_bsd_command_wlanstats(ARGC(wlanstats), wlanstats); assert(rtems_resource_snapshot_check(&snapshot)); +#endif /* RTEMS_BSD_MODULE_USER_SPACE_WLANSTATS */ } static void diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h index d26df03c..ee95d26e 100644 --- a/testsuite/include/rtems/bsd/test/default-network-init.h +++ b/testsuite/include/rtems/bsd/test/default-network-init.h @@ -47,6 +47,7 @@ #include <rtems/printer.h> #include <rtems/stackchk.h> #include <rtems/bsd/bsd.h> +#include <rtems/bsd/modules.h> #if defined(DEFAULT_NETWORK_DHCPCD_ENABLE) && \ !defined(DEFAULT_NETWORK_NO_STATIC_IFCONFIG) @@ -327,7 +328,21 @@ Init(rtems_task_argument arg) #include <rtems/netcmds-config.h> +#ifdef RTEMS_BSD_MODULE_USER_SPACE_WLANSTATS + #define SHELL_WLANSTATS_COMMAND &rtems_shell_WLANSTATS_Command, +#else + #define SHELL_WLANSTATS_COMMAND +#endif + +#ifdef RTEMS_BSD_MODULE_USR_SBIN_WPA_SUPPLICANT + #define SHELL_WPA_SUPPLICANT_COMMAND &rtems_shell_WPA_SUPPLICANT_Command, +#else + #define SHELL_WPA_SUPPLICANT_COMMAND +#endif + #define CONFIGURE_SHELL_USER_COMMANDS \ + SHELL_WLANSTATS_COMMAND \ + SHELL_WPA_SUPPLICANT_COMMAND \ &bsp_interrupt_shell_command, \ &rtems_shell_ARP_Command, \ &rtems_shell_HOSTNAME_Command, \ @@ -337,9 +352,7 @@ Init(rtems_task_argument arg) &rtems_shell_IFCONFIG_Command, \ &rtems_shell_TCPDUMP_Command, \ &rtems_shell_SYSCTL_Command, \ - &rtems_shell_VMSTAT_Command, \ - &rtems_shell_WLANSTATS_Command, \ - &rtems_shell_WPA_SUPPLICANT_Command + &rtems_shell_VMSTAT_Command #define CONFIGURE_SHELL_COMMAND_CPUINFO #define CONFIGURE_SHELL_COMMAND_CPUUSE diff --git a/testsuite/media01/test_main.c b/testsuite/media01/test_main.c index f929cba1..c9d902dc 100644 --- a/testsuite/media01/test_main.c +++ b/testsuite/media01/test_main.c @@ -200,7 +200,16 @@ early_initialization(void) #include <rtems/netcmds-config.h> +#ifdef RTEMS_BSD_MODULE_USR_SBIN_WPA_SUPPLICANT + #define SHELL_WPA_SUPPLICANT_COMMANDS \ + &rtems_shell_WPA_SUPPLICANT_Command, \ + &rtems_shell_WPA_SUPPLICANT_FORK_Command, +#else + #define SHELL_WPA_SUPPLICANT_COMMANDS +#endif + #define CONFIGURE_SHELL_USER_COMMANDS \ + SHELL_WPA_SUPPLICANT_COMMANDS \ &bsp_interrupt_shell_command, \ &rtems_shell_ARP_Command, \ &rtems_shell_HOSTNAME_Command, \ @@ -209,9 +218,7 @@ early_initialization(void) &rtems_shell_NETSTAT_Command, \ &rtems_shell_SYSCTL_Command, \ &rtems_shell_IFCONFIG_Command, \ - &rtems_shell_VMSTAT_Command, \ - &rtems_shell_WPA_SUPPLICANT_Command, \ - &rtems_shell_WPA_SUPPLICANT_FORK_Command + &rtems_shell_VMSTAT_Command #define CONFIGURE_SHELL_COMMAND_CPUINFO #define CONFIGURE_SHELL_COMMAND_CPUUSE |