From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson To: passt-dev@passt.top Subject: [PATCH v2 22/32] test: Group tests by context then protocol, rather than the reverse Date: Thu, 08 Sep 2022 16:16:11 +1000 Message-ID: <20220908061621.2430844-23-david@gibson.dropbear.id.au> In-Reply-To: <20220908061621.2430844-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5854793943302811330==" --===============5854793943302811330== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable e.g. passt/dhcp rather than dhcp/passt. This is more consistent with the two_guests and other test groups, and makes some other cleanups simpler. Signed-off-by: David Gibson --- test/{dhcp/passt =3D> passt/dhcp} | 2 +- test/{ndp/passt =3D> passt/ndp} | 2 +- test/{shutdown/passt =3D> passt/shutdown} | 2 +- test/{tcp/passt =3D> passt/tcp} | 2 +- test/{udp/passt =3D> passt/udp} | 2 +- test/{icmp/passt_in_ns =3D> passt_in_ns/icmp} | 2 +- .../passt_in_ns =3D> passt_in_ns/shutdown} | 2 +- test/{tcp/passt_in_ns =3D> passt_in_ns/tcp} | 2 +- test/{udp/passt_in_ns =3D> passt_in_ns/udp} | 2 +- test/{dhcp/pasta =3D> pasta/dhcp} | 2 +- test/{ndp/pasta =3D> pasta/ndp} | 2 +- test/{tcp/pasta =3D> pasta/tcp} | 2 +- test/{udp/pasta =3D> pasta/udp} | 2 +- test/run | 38 +++++++++---------- 14 files changed, 32 insertions(+), 32 deletions(-) rename test/{dhcp/passt =3D> passt/dhcp} (98%) rename test/{ndp/passt =3D> passt/ndp} (95%) rename test/{shutdown/passt =3D> passt/shutdown} (87%) rename test/{tcp/passt =3D> passt/tcp} (98%) rename test/{udp/passt =3D> passt/udp} (97%) rename test/{icmp/passt_in_ns =3D> passt_in_ns/icmp} (94%) rename test/{shutdown/passt_in_ns =3D> passt_in_ns/shutdown} (87%) rename test/{tcp/passt_in_ns =3D> passt_in_ns/tcp} (99%) rename test/{udp/passt_in_ns =3D> passt_in_ns/udp} (98%) rename test/{dhcp/pasta =3D> pasta/dhcp} (96%) rename test/{ndp/pasta =3D> pasta/ndp} (95%) rename test/{tcp/pasta =3D> pasta/tcp} (98%) rename test/{udp/pasta =3D> pasta/udp} (98%) diff --git a/test/dhcp/passt b/test/passt/dhcp similarity index 98% rename from test/dhcp/passt rename to test/passt/dhcp index 37bf6b5..eef5183 100644 --- a/test/dhcp/passt +++ b/test/passt/dhcp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/dhcp/passt - Check DHCP and DHCPv6 functionality in passt mode +# test/passt/dhcp - Check DHCP and DHCPv6 functionality in passt mode # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/ndp/passt b/test/passt/ndp similarity index 95% rename from test/ndp/passt rename to test/passt/ndp index c73fd4d..280b3ae 100644 --- a/test/ndp/passt +++ b/test/passt/ndp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/ndp/passt - Check NDP functionality in passt mode +# test/passt/ndp - Check NDP functionality in passt mode # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/shutdown/passt b/test/passt/shutdown similarity index 87% rename from test/shutdown/passt rename to test/passt/shutdown index ac8ff08..ce90ea9 100644 --- a/test/shutdown/passt +++ b/test/passt/shutdown @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/shutdown/passt - Shut down passt (or pasta) and check exit code (will +# test/passt/shutdown - Shut down passt (or pasta) and check exit code (will # detect valgrind errors amongst others) # # Copyright (c) 2022 Red Hat GmbH diff --git a/test/tcp/passt b/test/passt/tcp similarity index 98% rename from test/tcp/passt rename to test/passt/tcp index 265f270..d5c8164 100644 --- a/test/tcp/passt +++ b/test/passt/tcp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/tcp/passt - Check TCP functionality in passt mode +# test/passt/tcp - Check TCP functionality in passt mode # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/udp/passt b/test/passt/udp similarity index 97% rename from test/udp/passt rename to test/passt/udp index a14e6d2..56d01b3 100644 --- a/test/udp/passt +++ b/test/passt/udp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/udp/passt - Check UDP functionality in passt mode +# test/passt/udp - Check UDP functionality in passt mode # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/icmp/passt_in_ns b/test/passt_in_ns/icmp similarity index 94% rename from test/icmp/passt_in_ns rename to test/passt_in_ns/icmp index e4ac4ff..f326d4b 100644 --- a/test/icmp/passt_in_ns +++ b/test/passt_in_ns/icmp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/icmp/passt_in_ns - Check ICMP/ICMPv6 functionality for passt in ns +# test/passt_in_ns/icmp - Check ICMP/ICMPv6 functionality for passt in ns # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/shutdown/passt_in_ns b/test/passt_in_ns/shutdown similarity index 87% rename from test/shutdown/passt_in_ns rename to test/passt_in_ns/shutdown index 3808adb..abe9d6c 100644 --- a/test/shutdown/passt_in_ns +++ b/test/passt_in_ns/shutdown @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/shutdown/passt_in_ns - Shut down passt and check exit code (will dete= ct +# test/passt_in_ns/shutdown - Shut down passt and check exit code (will dete= ct # valgrind errors amongst others) # # Copyright (c) 2022 Red Hat GmbH diff --git a/test/tcp/passt_in_ns b/test/passt_in_ns/tcp similarity index 99% rename from test/tcp/passt_in_ns rename to test/passt_in_ns/tcp index a248f00..5ec95e8 100644 --- a/test/tcp/passt_in_ns +++ b/test/passt_in_ns/tcp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/tcp/passt_in_ns - Check TCP functionality for passt in ns with pasta +# test/passt_in_ns/tcp - Check TCP functionality for passt in ns with pasta # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/udp/passt_in_ns b/test/passt_in_ns/udp similarity index 98% rename from test/udp/passt_in_ns rename to test/passt_in_ns/udp index d5f08fe..c22a68f 100644 --- a/test/udp/passt_in_ns +++ b/test/passt_in_ns/udp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/udp/passt_in_ns - Check UDP functionality for passt in ns and pasta +# test/passt_in_ns/udp - Check UDP functionality for passt in ns and pasta # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/dhcp/pasta b/test/pasta/dhcp similarity index 96% rename from test/dhcp/pasta rename to test/pasta/dhcp index d1e9611..80eabf5 100644 --- a/test/dhcp/pasta +++ b/test/pasta/dhcp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/dhcp/pasta - Check DHCP and DHCPv6 functionality in pasta mode +# test/pasta/dhcp - Check DHCP and DHCPv6 functionality in pasta mode # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/ndp/pasta b/test/pasta/ndp similarity index 95% rename from test/ndp/pasta rename to test/pasta/ndp index d776055..d2b2c0b 100644 --- a/test/ndp/pasta +++ b/test/pasta/ndp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/ndp/pasta - Check DHCP and DHCPv6 functionality in pasta mode +# test/pasta/ndp - Check DHCP and DHCPv6 functionality in pasta mode # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/tcp/pasta b/test/pasta/tcp similarity index 98% rename from test/tcp/pasta rename to test/pasta/tcp index a13a2ff..7c7de06 100644 --- a/test/tcp/pasta +++ b/test/pasta/tcp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/tcp/pasta - Check TCP functionality for pasta +# test/pasta/tcp - Check TCP functionality for pasta # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/udp/pasta b/test/pasta/udp similarity index 98% rename from test/udp/pasta rename to test/pasta/udp index 0767e0b..0e58152 100644 --- a/test/udp/pasta +++ b/test/pasta/udp @@ -6,7 +6,7 @@ # PASTA - Pack A Subtle Tap Abstraction # for network namespace/tap device mode # -# test/udp/pasta - Check UDP functionality for pasta +# test/pasta/udp - Check UDP functionality for pasta # # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio diff --git a/test/run b/test/run index 0ec1334..d8b60bf 100755 --- a/test/run +++ b/test/run @@ -74,40 +74,40 @@ run() { teardown distro =20 setup pasta - test ndp/pasta - test dhcp/pasta - test tcp/pasta - test udp/pasta - test shutdown/passt + test pasta/ndp + test pasta/dhcp + test pasta/tcp + test pasta/udp + test passt/shutdown teardown pasta =20 setup passt - test ndp/passt - test dhcp/passt - test tcp/passt - test udp/passt - test shutdown/passt + test passt/ndp + test passt/dhcp + test passt/tcp + test passt/udp + test passt/shutdown teardown passt =20 VALGRIND=3D1 setup passt_in_ns - test ndp/passt - test dhcp/passt - test icmp/passt_in_ns - test tcp/passt_in_ns - test udp/passt_in_ns - test shutdown/passt_in_ns + test passt/ndp + test passt/dhcp + test passt_in_ns/icmp + test passt_in_ns/tcp + test passt_in_ns/udp + test passt_in_ns/shutdown teardown passt_in_ns =20 VALGRIND=3D0 setup passt_in_ns - test ndp/passt - test dhcp/passt + test passt/ndp + test passt/dhcp test perf/passt_tcp test perf/passt_udp test perf/pasta_tcp test perf/pasta_udp - test shutdown/passt_in_ns + test passt_in_ns/shutdown teardown passt_in_ns =20 setup two_guests --=20 2.37.3 --===============5854793943302811330==--