X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FNetTest_Runner%2Finclude%2Ftest.h;h=9ad23c35cce0e3699962d978e69a9935b3d9e904;hb=66250a13b0607f3599999a0ab70453ef1658c20f;hp=bf2da1516c83030e28956d8934655edb434a8852;hpb=eb42cce3c834d711e888d7866db98c563710993d;p=tpg%2Facess2.git

diff --git a/Tools/NetTest_Runner/include/test.h b/Tools/NetTest_Runner/include/test.h
index bf2da151..9ad23c35 100644
--- a/Tools/NetTest_Runner/include/test.h
+++ b/Tools/NetTest_Runner/include/test.h
@@ -6,6 +6,7 @@
 #include <stddef.h>
 
 #define TEST_SETNAME(name)	test_setname(name)
+#define TEST_STEP(name) 	do{}while(0)	//test_setstep(name)
 #define TEST_ASSERT(cnd)	do{if(!(cnd)) {test_assertion_fail(__FILE__,__LINE__,"%s",#cnd);return false;}}while(0)
 #define TEST_ASSERT_REL(a,r,b)	do{long long a_val=(a),b_val=(b);if(!(a_val r b_val)) {test_assertion_fail(__FILE__,__LINE__,"%s(0x%llx)%s%s(0x%llx)",#a,a_val,#r,#b,b_val);return false;}}while(0)
 #define TEST_WARN(msg...)	test_message(__FILE__,__LINE__,msg)
@@ -16,5 +17,18 @@ extern void	test_assertion_fail(const char *filename, int line, const char *test
 extern void	test_trace(const char *msg, ...);
 extern void	test_trace_hexdump(const char *hdr, const void *data, size_t len);
 
+// Some helpful macros
+// - They require some names to be present
+#define RX_HEADER \
+	size_t	rxlen, ofs, len; \
+	do { ofs = 0; ofs = ofs; len = 0; len = len; } while(0);\
+	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 )
+
 #endif