summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiejunZhou <[email protected]>2023-12-27 06:03:33 +0000
committerTiejunZhou <[email protected]>2023-12-27 06:03:33 +0000
commit4d19ce4bf9cc07488a35d5bfb478d47ac15418c0 (patch)
treec542dfccb5904bd8e9b7570b05658f8136fd8066
parent1dd1bc741a2f9595f6c416c33575b49bbc13d792 (diff)
Add missing test case to netxtestcontrol.c
-rw-r--r--test/regression/test/netxtestcontrol.c23
-rw-r--r--test/regression/tsn_test/netx_shaper_tas_test.c8
2 files changed, 17 insertions, 14 deletions
diff --git a/test/regression/test/netxtestcontrol.c b/test/regression/test/netxtestcontrol.c
index 958d5082..c8f18205 100644
--- a/test/regression/test/netxtestcontrol.c
+++ b/test/regression/test/netxtestcontrol.c
@@ -204,9 +204,6 @@ void netx_dest_table_add_fail_test_application_define(void *);
void netx_ip_basic_test_application_define(void *);
void netx_ip_link_status_test_application_define(void *);
-void netx_ip_link_status_test2_application_define(void *);
-void netx_shaper_cbs_test_application_define(void *);
-void netx_mrp_state_machine_test_application_define(void *);
void netx_ip_create_test_application_define(void *);
void netx_ip_delete_test_application_define(void *);
void netx_ip_status_check_test_application_define(void*);
@@ -1322,6 +1319,15 @@ void netx_tahi_dhcpv6_test_07_025_define(void * );
void netx_tahi_dhcpv6_test_07_026_define(void * );
void netx_tahi_dhcpv6_test_07_027_define(void * );
#endif /* NX_DHCPV6_TAHI_ENABLE*/
+
+#ifdef NX_ENABLE_VLAN
+ /* TSN related tests. */
+void netx_ip_link_status_test2_application_define(void *);
+void netx_shaper_cbs_test_application_define(void *);
+void netx_shaper_tas_test_application_define(void *);
+void netx_mrp_state_machine_test_application_define(void *);
+#endif /* NX_ENABLE_VLAN */
+
void test_application_define(void * );
@@ -1462,9 +1468,6 @@ TEST_ENTRY test_control_tests[] =
/* IPv4 test */
{netx_ip_basic_test_application_define, TEST_TIMEOUT_LOW},
{netx_ip_link_status_test_application_define, TEST_TIMEOUT_LOW},
- {netx_ip_link_status_test2_application_define, TEST_TIMEOUT_LOW},
- {netx_shaper_cbs_test_application_define, TEST_TIMEOUT_LOW},
- {netx_mrp_state_machine_test_application_define, TEST_TIMEOUT_LOW},
{netx_ip_create_test_application_define, TEST_TIMEOUT_LOW},
{netx_ip_delete_test_application_define, TEST_TIMEOUT_LOW},
{netx_ip_fragmentation_order_test_application_define, TEST_TIMEOUT_LOW},
@@ -1927,6 +1930,14 @@ TEST_ENTRY test_control_tests[] =
{netx_106_17_application_define, TEST_TIMEOUT_LOW},
#endif /* SNMP_ONLY */
+#ifdef NX_ENABLE_VLAN
+ /* TSN related tests. */
+ {netx_ip_link_status_test2_application_define, TEST_TIMEOUT_LOW},
+ {netx_shaper_cbs_test_application_define, TEST_TIMEOUT_LOW},
+ {netx_shaper_tas_test_application_define, TEST_TIMEOUT_LOW},
+ {netx_mrp_state_machine_test_application_define, TEST_TIMEOUT_LOW},
+#endif /* NX_ENABLE_VLAN */
+
#if !defined CERT_BUILD && !defined (SNMP_ONLY)
/* Application tests do not support for 64-bit mode yet. */
diff --git a/test/regression/tsn_test/netx_shaper_tas_test.c b/test/regression/tsn_test/netx_shaper_tas_test.c
index f9f8bc68..3d72ccf1 100644
--- a/test/regression/tsn_test/netx_shaper_tas_test.c
+++ b/test/regression/tsn_test/netx_shaper_tas_test.c
@@ -52,14 +52,6 @@ extern UINT nx_cbs_driver(NX_SHAPER_DRIVER_PARAMETER *params);
/***** Substitute your ethernet driver entry function here *********/
void _nx_ram_network_driver(struct NX_IP_DRIVER_STRUCT *driver_req);
-/* Define main entry point. */
-int main()
-{
-
- /* Enter the ThreadX kernel. */
- tx_kernel_enter();
-}
-
/* Define what the initial system looks like. */
#ifdef CTEST
VOID test_application_define(void *first_unused_memory)