update include path and includes

Author: JacobBarthelmeh

.github/workflows/threadx.yml

@@ -120,14 +120,15 @@ jobs:
         /* threadx_netx_test.c
          * Minimal ThreadX/NetX test app using NetConnect logic from mqttnet.c
          */
-        
+
         #include <stdio.h>
         #include "tx_api.h"
         #include "nx_api.h"
         #include "nxd_dns.h"
+        #include "wolfmqtt/mqtt_client.h"
         #include "examples/mqttnet.h"
         #include "examples/mqttexample.h"
-        
+
         #define DEMO_STACK_SIZE         2048
         #define DEMO_IP_ADDRESS         IP_ADDRESS(192,168,1,100)
         #define DEMO_NET_MASK           0xFFFFFF00
@@ -136,25 +137,25 @@ jobs:
         #define DEMO_HOSTNAME           "test.mosquitto.org"
         #define DEMO_PORT               1883
         #define DEMO_TIMEOUT_MS         5000
-        
+
         /* ThreadX/NetX objects */
         TX_THREAD       demo_thread;
         ULONG           demo_thread_stack[DEMO_STACK_SIZE / sizeof(ULONG)];
         NX_PACKET_POOL  pool_0;
         NX_IP           ip_0;
         NX_DNS          dns_0;
-        
+
         /* Forward declaration */
         void    demo_thread_entry(ULONG thread_input);
-        
+
         void tx_application_define(void *first_unused_memory)
         {
             /* Create the main demo thread. */
             tx_thread_create(&demo_thread, "Demo Thread", demo_thread_entry, 0,
                              demo_thread_stack, DEMO_STACK_SIZE,
                              1, 1, TX_NO_TIME_SLICE, TX_AUTO_START);
         }
-        
+
         void demo_thread_entry(ULONG thread_input)
         {
             UINT status;
@@ -163,18 +164,18 @@ jobs:
             MqttNet net;
             SocketContext *sockCtx;
             int rc;
-        
+
             /* Initialize NetX system */
             nx_system_initialize();
-        
+
             /* Create a packet pool. */
             status = nx_packet_pool_create(&pool_0, "NetX Main Packet Pool",
                                            1536, (UCHAR*)first_unused_memory, 16*1536);
             if (status != NX_SUCCESS) {
                 printf("Packet pool create failed: %u\n", status);
                 return;
             }
-        
+
             /* Create an IP instance. */
             status = nx_ip_create(&ip_0, "NetX IP Instance",
                                  DEMO_IP_ADDRESS, DEMO_NET_MASK,
@@ -184,13 +185,13 @@ jobs:
                 printf("IP create failed: %u\n", status);
                 return;
             }
-        
+
             /* Enable ARP, ICMP, TCP, UDP */
             nx_arp_enable(&ip_0, (UCHAR*)first_unused_memory + 16*1536 + 2048, 1024);
             nx_icmp_enable(&ip_0);
             nx_tcp_enable(&ip_0);
             nx_udp_enable(&ip_0);
-        
+
             /* Create DNS instance */
             status = nxd_dns_create(&dns_0, (UCHAR*)"DNS Client", &ip_0, (UCHAR*)first_unused_memory + 16*1536 + 2048 + 1024, 2048);
             if (status != NX_SUCCESS) {
@@ -200,14 +201,14 @@ jobs:
             dns_server.nxd_ip_version = NX_IP_VERSION_V4;
             dns_server.nxd_ip_address.v4 = DEMO_DNS_SERVER;
             nxd_dns_server_add(&dns_0, &dns_server);
-        
+
             /* Initialize MQTT context and network */
             mqtt_init_ctx(&mqttCtx);
             MqttClientNet_Init(&net, &mqttCtx);
             sockCtx = (SocketContext*)net.context;
             sockCtx->ipPtr = &ip_0;
             sockCtx->dnsPtr = &dns_0;
-        
+
             /* Use NetConnect to connect to the MQTT broker */
             rc = net.connect(sockCtx, DEMO_HOSTNAME, DEMO_PORT, DEMO_TIMEOUT_MS);
             if (rc == 0) {
@@ -216,15 +217,15 @@ jobs:
             } else {
                 printf("NetConnect failed: %d\n", rc);
             }
-        
+
             /* Cleanup (not strictly necessary in a demo) */
             nxd_dns_delete(&dns_0);
             nx_ip_delete(&ip_0);
             nx_packet_pool_delete(&pool_0);
             /* Thread exits */
             tx_thread_terminate(&demo_thread);
         }
-        
+
         /* Placeholder driver for demo purposes */
         void nx_driver_placeholder(NX_IP_DRIVER *driver_req)
         {
@@ -235,12 +236,7 @@ jobs:
     - name: Compile ThreadX NetX test app
       working-directory: ./wolfmqtt
       run: |
-        gcc -o threadx_netx_test examples/threadx_netx_test.c -I${{ github.workspace }}/netxduo_src/common/inc -I${{ github.workspace }}/netxduo_src/ports/linux/gnu/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/default_build_coverage/netxduo -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx -lnetxduo -lthreadx -lwolfssl -lwolfmqtt
-
-    - name: Run ThreadX NetX test app
-      working-directory: ./wolfmqtt
-      run: |
-        ./threadx_netx_test
+        gcc -o threadx_netx_test examples/threadx_netx_test.c examples/mqttnet.c examples/mqttexample.c -I. -I${{ github.workspace }}/netxduo_src/common/inc -I${{ github.workspace }}/netxduo_src/ports/linux/gnu/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/default_build_coverage/netxduo -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx -lnetxduo -lthreadx -lwolfssl -lwolfmqtt
 
       # capture logs on failure
     - name: Show logs on failure