Merge pull request #1255 from microsoft/enhancement-test-simulation

[test] Recursive Test Case Discovery
microsoft · Apr 30, 2024 · 598a6de · 598a6de
2 parents c45406c + e5791ce
commit 598a6de
Show file tree

Hide file tree

Showing 23 changed files with 99 additions and 85 deletions.
diff --git a/linux.mk b/linux.mk
@@ -32,7 +32,7 @@ export BUILD_DIR := $(CURDIR)/target/release
 ifeq ($(BUILD),dev)
 export BUILD_DIR := $(CURDIR)/target/debug
 endif
-export INPUT_DIR ?= $(CURDIR)/nettest/input
+export INPUT ?= $(CURDIR)/nettest/input
 
 #=======================================================================================================================
 # Toolchain Configuration

diff --git a/nettest/input/accept-blocking-1.pkt → nettest/input/accept/accept-blocking-1.pkt b/nettest/input/accept-blocking-1.pkt → nettest/input/accept/accept-blocking-1.pkt
@@ -1,7 +1,7 @@
 // Test for blocking accept.
 
 // Accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/accept-blocking-2.pkt → nettest/input/accept/accept-blocking-2.pkt b/nettest/input/accept-blocking-2.pkt → nettest/input/accept/accept-blocking-2.pkt
@@ -1,7 +1,7 @@
 // Test for blocking accept with syn ack retransmission.
 
 // Accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/accept-refuse-1.pkt → nettest/input/accept/accept-refuse-1.pkt b/nettest/input/accept-refuse-1.pkt → nettest/input/accept/accept-refuse-1.pkt
@@ -1,7 +1,7 @@
 // Test for early ACK packet on accept.
 
 // Attempt to accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/accept-refuse-2.pkt → nettest/input/accept/accept-refuse-2.pkt b/nettest/input/accept-refuse-2.pkt → nettest/input/accept/accept-refuse-2.pkt
@@ -1,7 +1,7 @@
 // Test for early PSH packet on accept.
 
 // Attempt to accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/accept-refuse-3.pkt → nettest/input/accept/accept-refuse-3.pkt b/nettest/input/accept-refuse-3.pkt → nettest/input/accept/accept-refuse-3.pkt
@@ -1,7 +1,7 @@
 // Test for early RST packet on accept.
 
 // Attempt to accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/accept-refuse-4.pkt → nettest/input/accept/accept-refuse-4.pkt b/nettest/input/accept-refuse-4.pkt → nettest/input/accept/accept-refuse-4.pkt
@@ -1,7 +1,7 @@
 // Test for early PHS-ACK packet on accept.
 
 // Attempt to accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/accept-refuse-5.pkt → nettest/input/accept/accept-refuse-5.pkt b/nettest/input/accept-refuse-5.pkt → nettest/input/accept/accept-refuse-5.pkt
@@ -1,7 +1,7 @@
 // Test for early RST-ACK packet on accept.
 
 // Attempt to accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/accept-refuse-6.pkt → nettest/input/accept/accept-refuse-6.pkt b/nettest/input/accept-refuse-6.pkt → nettest/input/accept/accept-refuse-6.pkt
@@ -1,7 +1,7 @@
 // Test for early SYN-ACK packet on accept.
 
 // Attempt to accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/accept-syn-carrying-data.pkt → ...input/accept/accept-syn-carrying-data.pkt b/nettest/input/accept-syn-carrying-data.pkt → ...input/accept/accept-syn-carrying-data.pkt
@@ -1,7 +1,7 @@
 // Tests for successful completion of an accept system call, when a data-carrying, SYN segment is received.
 
 // Accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/close-blocking.pkt → nettest/input/close/close-blocking.pkt b/nettest/input/close-blocking.pkt → nettest/input/close/close-blocking.pkt
@@ -1,7 +1,7 @@
 // Test for blocking close.
 
 // Establish a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.2 connect(500, ..., ...) = 0
 
 // Send SYN packet.

diff --git a/nettest/input/local-close.pkt → nettest/input/close/close-local.pkt b/nettest/input/local-close.pkt → nettest/input/close/close-local.pkt
@@ -1,7 +1,7 @@
 // Tests for local close.
 
 // Establish a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.2 connect(500, ..., ...) = 0
 
 // Send SYN segment.

diff --git a/nettest/input/remote-close.pkt → nettest/input/close/close-remote.pkt b/nettest/input/remote-close.pkt → nettest/input/close/close-remote.pkt
@@ -1,7 +1,7 @@
 // Tests for remote close.
 
 // Establish a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.2 connect(500, ..., ...) = 0
 
 // Send SYN segment.

diff --git a/nettest/input/connect-blocking.pkt → nettest/input/connect/connect-blocking.pkt b/nettest/input/connect-blocking.pkt → nettest/input/connect/connect-blocking.pkt
@@ -1,7 +1,7 @@
 // Test for blocking connect.
 
 // Establish a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.2 connect(500, ..., ...) = 0
 
 // Send SYN packet.

diff --git a/nettest/input/connect-early-reset.pkt → ...est/input/connect/connect-early-reset.pkt b/nettest/input/connect-early-reset.pkt → ...est/input/connect/connect-early-reset.pkt
@@ -1,7 +1,7 @@
 // Test for early reset on connect.
 
 // Attempt to establish a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.2 connect(500, ..., ...) = 0
 
 // Send SYN packet.

diff --git a/nettest/input/connect-timeout.pkt → nettest/input/connect/connect-timeout.pkt b/nettest/input/connect-timeout.pkt → nettest/input/connect/connect-timeout.pkt
@@ -1,7 +1,7 @@
 // Test for connect timeout.
 
 // Attempt to establish a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.1 connect(500, ..., ...) = 0
 
 // Send SYN packet.

diff --git a/nettest/input/pop-blocking.pkt → nettest/input/pop/pop-blocking.pkt b/nettest/input/pop-blocking.pkt → nettest/input/pop/pop-blocking.pkt
@@ -1,7 +1,7 @@
 // Test for blocking pop.
 
 // Accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/pop-push-blocking.pkt → nettest/input/pop/pop-push-blocking.pkt b/nettest/input/pop-push-blocking.pkt → nettest/input/pop/pop-push-blocking.pkt
@@ -1,7 +1,7 @@
 // Test for blocking pop-push round.
 
 // Accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/push-blocking.pkt → nettest/input/push/push-blocking.pkt b/nettest/input/push-blocking.pkt → nettest/input/push/push-blocking.pkt
@@ -1,7 +1,7 @@
 // Test for blocking push.
 
 // Accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/push-pop-blocking.pkt → nettest/input/push/push-pop-blocking.pkt b/nettest/input/push-pop-blocking.pkt → nettest/input/push/push-pop-blocking.pkt
@@ -1,7 +1,7 @@
 // Test for blocking push-pop.
 
 // Accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0

diff --git a/nettest/input/push-retransmission.pkt → nettest/input/push/push-retransmission.pkt b/nettest/input/push-retransmission.pkt → nettest/input/push/push-retransmission.pkt
@@ -1,7 +1,7 @@
 // Test for blocking push.
 
 // Accept a connection.
- .0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
+ +.0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 500
 +.0 bind(500, ..., ...) = 0
 +.0 listen(500, 1) = 0
 +.2 accept(500, ..., ...) = 0