From: Tomas Bzatek Date: Fri, 5 Jan 2024 13:49:15 +0000 (+0100) Subject: tests: Fix diffs output for duplicate HFI entries X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fa5f21db8c4926283401437f4cb4f67763c1e63e;p=users%2Fsagi%2Flibnvme.git tests: Fix diffs output for duplicate HFI entries With commit "nbft: avoid duplicate entries in ssns->hfis" applied, nbft-dump will not see any duplicate HFI indices any more. Fix the reference output for generating the diffs. Signed-off-by: Martin Wilck Signed-off-by: Tomas Bzatek --- diff --git a/test/nbft/diffs/NBFT-auto-ipv6 b/test/nbft/diffs/NBFT-auto-ipv6 index 32a8b607..83ee6430 100644 --- a/test/nbft/diffs/NBFT-auto-ipv6 +++ b/test/nbft/diffs/NBFT-auto-ipv6 @@ -23,7 +23,6 @@ hfi_list[0]->tcp_info.dhcp_override=0 subsystem_ns_list[0]->index=1 subsystem_ns_list[0]->num_hfis=1 subsystem_ns_list[0]->hfis[0]->index=1 -subsystem_ns_list[0]->hfis[1]->index=1 subsystem_ns_list[0]->transport=tcp subsystem_ns_list[0]->traddr=fd09:9a46:b5c1:1ff:5054:ff:fefd:9e66 subsystem_ns_list[0]->trsvcid=4420 diff --git a/test/nbft/diffs/NBFT-dhcp-ipv4 b/test/nbft/diffs/NBFT-dhcp-ipv4 index cb280d9a..067079d9 100644 --- a/test/nbft/diffs/NBFT-dhcp-ipv4 +++ b/test/nbft/diffs/NBFT-dhcp-ipv4 @@ -28,7 +28,6 @@ subsystem_ns_list[0]->index=1 subsystem_ns_list[0]->discovery->index=1 subsystem_ns_list[0]->num_hfis=1 subsystem_ns_list[0]->hfis[0]->index=1 -subsystem_ns_list[0]->hfis[1]->index=1 subsystem_ns_list[0]->transport=tcp subsystem_ns_list[0]->traddr=192.168.49.10 subsystem_ns_list[0]->trsvcid=4420 diff --git a/test/nbft/diffs/NBFT-dhcp-ipv6 b/test/nbft/diffs/NBFT-dhcp-ipv6 index b94cc394..11c974f6 100644 --- a/test/nbft/diffs/NBFT-dhcp-ipv6 +++ b/test/nbft/diffs/NBFT-dhcp-ipv6 @@ -23,7 +23,6 @@ hfi_list[0]->tcp_info.dhcp_override=1 subsystem_ns_list[0]->index=1 subsystem_ns_list[0]->num_hfis=1 subsystem_ns_list[0]->hfis[0]->index=1 -subsystem_ns_list[0]->hfis[1]->index=1 subsystem_ns_list[0]->transport=tcp subsystem_ns_list[0]->traddr=fddf:d:f:49::10 subsystem_ns_list[0]->trsvcid=4420 diff --git a/test/nbft/diffs/NBFT-rhpoc b/test/nbft/diffs/NBFT-rhpoc index d4b4ad84..d849b6e1 100644 --- a/test/nbft/diffs/NBFT-rhpoc +++ b/test/nbft/diffs/NBFT-rhpoc @@ -23,7 +23,6 @@ hfi_list[0]->tcp_info.dhcp_override=0 subsystem_ns_list[0]->index=1 subsystem_ns_list[0]->num_hfis=1 subsystem_ns_list[0]->hfis[0]->index=1 -subsystem_ns_list[0]->hfis[1]->index=1 subsystem_ns_list[0]->transport=tcp subsystem_ns_list[0]->traddr=192.168.101.20 subsystem_ns_list[0]->trsvcid=4420 diff --git a/test/nbft/diffs/NBFT-static-ipv4 b/test/nbft/diffs/NBFT-static-ipv4 index 715b30d2..a6f38597 100644 --- a/test/nbft/diffs/NBFT-static-ipv4 +++ b/test/nbft/diffs/NBFT-static-ipv4 @@ -23,7 +23,6 @@ hfi_list[0]->tcp_info.dhcp_override=0 subsystem_ns_list[0]->index=1 subsystem_ns_list[0]->num_hfis=1 subsystem_ns_list[0]->hfis[0]->index=1 -subsystem_ns_list[0]->hfis[1]->index=1 subsystem_ns_list[0]->transport=tcp subsystem_ns_list[0]->traddr=192.168.49.10 subsystem_ns_list[0]->trsvcid=4420 diff --git a/test/nbft/diffs/NBFT-static-ipv4-discovery b/test/nbft/diffs/NBFT-static-ipv4-discovery index 67881b6c..5bf0e46f 100644 --- a/test/nbft/diffs/NBFT-static-ipv4-discovery +++ b/test/nbft/diffs/NBFT-static-ipv4-discovery @@ -28,7 +28,6 @@ subsystem_ns_list[0]->index=1 subsystem_ns_list[0]->discovery->index=1 subsystem_ns_list[0]->num_hfis=1 subsystem_ns_list[0]->hfis[0]->index=1 -subsystem_ns_list[0]->hfis[1]->index=1 subsystem_ns_list[0]->transport=tcp subsystem_ns_list[0]->traddr=192.168.49.10 subsystem_ns_list[0]->trsvcid=4420 diff --git a/test/nbft/diffs/NBFT-static-ipv6 b/test/nbft/diffs/NBFT-static-ipv6 index a5b02c1d..c6ad844d 100644 --- a/test/nbft/diffs/NBFT-static-ipv6 +++ b/test/nbft/diffs/NBFT-static-ipv6 @@ -23,7 +23,6 @@ hfi_list[0]->tcp_info.dhcp_override=0 subsystem_ns_list[0]->index=1 subsystem_ns_list[0]->num_hfis=1 subsystem_ns_list[0]->hfis[0]->index=1 -subsystem_ns_list[0]->hfis[1]->index=1 subsystem_ns_list[0]->transport=tcp subsystem_ns_list[0]->traddr=fd09:9a46:b5c1:1fe::13f subsystem_ns_list[0]->trsvcid=4420