misc - Cleaning up warnings that occur on travis

[tpg/acess2.git] / Tools / NetTest_Runner / test_tcp.c

diff --git a/Tools/NetTest_Runner/test_tcp.c b/Tools/NetTest_Runner/test_tcp.c
index b0ba915..8515f7f 100644 (file)
--- a/Tools/NetTest_Runner/test_tcp.c
+++ b/Tools/NetTest_Runner/test_tcp.c
@@ -16,21 +16,12 @@
 
 #define TEST_TIMERS    0
 
-#define RX_HEADER \
-       size_t  rxlen, ofs, len; \
-       char rxbuf[MTU]
-#define TEST_HEADER \
-       TEST_SETNAME(__func__);\
-       RX_HEADER
-
-#define TEST_ASSERT_rx()       TEST_ASSERT( rxlen = Net_Receive(0, sizeof(rxbuf), rxbuf, ERX_TIMEOUT) )
-#define TEST_ASSERT_no_rx()    TEST_ASSERT( Net_Receive(0, sizeof(rxbuf), rxbuf, NRX_TIMEOUT) == 0 )
-const int      ERX_TIMEOUT = 1000;     // Expect RX timeout (timeout=failure)
-const int      NRX_TIMEOUT = 250;      // Not expect RX timeout (timeout=success)
-const int      RETX_TIMEOUT = 1000;    // OS PARAM - Retransmit timeout
-const int      LOST_TIMEOUT = 1000;    // OS PARAM - Time before sending an ACK 
-const int      DACK_TIMEOUT = 500;     // OS PARAM - Timeout for delayed ACKs
-const size_t   DACK_BYTES = 4096;      // OS PARAM - Threshold for delayed ACKs
+static const int       ERX_TIMEOUT = 1000;     // Expect RX timeout (timeout=failure)
+static const int       NRX_TIMEOUT = 250;      // Not expect RX timeout (timeout=success)
+static const int       RETX_TIMEOUT = 1000;    // OS PARAM - Retransmit timeout
+//static const int     LOST_TIMEOUT = 1000;    // OS PARAM - Time before sending an ACK 
+//static const int     DACK_TIMEOUT = 500;     // OS PARAM - Timeout for delayed ACKs
+//static const size_t  DACK_BYTES = 4096;      // OS PARAM - Threshold for delayed ACKs
 
 bool Test_TCP_Basic(void)
 {
@@ -385,8 +376,10 @@ bool Test_TCP_Retransmit(void)
        TEST_ASSERT( TCP_Pkt_CheckC(rxlen, rxbuf, &ofs, &len, &testconn, TCP_ACK|TCP_PSH) );
        
        TEST_STEP("3. Expect nothing for TCP_RTX_TIMEOUT_1");
-       TEST_ASSERT( Net_Receive(0, sizeof(rxbuf), rxbuf, RETX_TIMEOUT-100) == 0 )
+       TEST_ASSERT( Net_Receive(0, sizeof(rxbuf), rxbuf, RETX_TIMEOUT-100) == 0 );
        
        TEST_STEP("4. Expect a retransmit");
        TEST_ASSERT_rx();
+       
+       return false;
 }