The current pattern for generating string payloads seems a bit heavy. Rely on simpler (POSIX) printf syntax using a width format.
Before: $ time make -C build check TESTSUITEFLAGS="1135 1136 1261 1262" ... 1135: dpif-netdev - tso ok 1136: dpif-netdev - tunnel tso fallback ok ... 1261: ofproto-dpif - fragment handling - actions ok 1262: ofproto-dpif - fragment handling - reassembly ok ... real 0m18,511s user 0m7,257s sys 0m11,074s After: $ time make -C build check TESTSUITEFLAGS="1135 1136 1261 1262" ... 1135: dpif-netdev - tso ok 1136: dpif-netdev - tunnel tso fallback ok ... 1261: ofproto-dpif - fragment handling - actions ok 1262: ofproto-dpif - fragment handling - reassembly ok ... real 0m5,056s user 0m2,807s sys 0m2,349s Signed-off-by: David Marchand <[email protected]> --- tests/dpif-netdev.at | 6 +++--- tests/ofproto-dpif.at | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at index 5580c43369..14f238e622 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -3301,7 +3301,7 @@ dnl - 4x IPv4 500 byte payloads dnl - 4x IPv6 500 byte payloads dnl - one IPv4 2000 byte payload, and dnl - one IPv6 2000 byte payload -zero500=$(printf '0%.0s' $(seq 1000)) +zero500=$(printf '%0*d' 1000 0) AT_CHECK_UNQUOTED([ovs-pcap p2.pcap], [0], [dnl [0a8f394fe0738abf7e2f058408004501021c0000000040060187c0a87b02c0a87b01]dnl [d47814510000000000000000501000004dc20000${zero500}] @@ -3415,8 +3415,8 @@ dnl - IPv4 GRE tunnel with IPv6 payload dnl - IPv6 GRE tunnel with IPv4 payload dnl - IPv6 GRE tunnel with IPv6 payload dnl These are sorted since OVS may send payloads to the tunnels in any order. -zero400=$(printf '0%.0s' $(seq 800)) -zero100=$(printf '0%.0s' $(seq 200)) +zero400=$(printf '%0*d' 800 0) +zero100=$(printf '%0*d' 200 0) AT_CHECK_UNQUOTED([ovs-pcap p1.pcap | sort], [0], [dnl [aabbcc000001aa55aa55000308004500025a00004000402f31c0010102580101025c200065580000007b0a8f394fe0738abf]dnl [7e2f058486dd60000000020806002001cafe0000000000000000000000882001cafe000000000000000000000092d4781451]dnl diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 02b4a02be1..ee6ac873d8 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -5489,7 +5489,7 @@ m4_define([GEN_IP_FRAGS], AT_CHECK([ovs-ofctl compose-packet --bare "${flow_first}"], [0], [stdout]) hdr=$(cat stdout) ip_len=$(printf '%04x' $((20 + frag_len))) - payload=$(printf '0%.0s' $(seq $(( (frag_len - 20) * 2 )))) + payload=$(printf '%0*d' $(( (frag_len - 20) * 2 )) 0) AT_CHECK([echo ${hdr}${payload} \ | sed "s/^\(.\{32\}\).\{12\}\(.\{4\}\).\{4\}/\1${ip_len}12342000\2dead/"], [0], [stdout]) @@ -5498,7 +5498,7 @@ m4_define([GEN_IP_FRAGS], AT_CHECK([ovs-ofctl compose-packet --bare "${flow_later}"], [0], [stdout]) hdr=$(cat stdout) ip_len=$(printf '%04x' $((20 + frag_len))) - payload=$(printf '0%.0s' $(seq $(( frag_len * 2 )))) + payload=$(printf '%0*d' $(( frag_len * 2 )) 0) for i in $(seq 1 61); do frag_off=$(printf '%04x' $((0x2000 + i * frag_len / 8))) AT_CHECK([echo ${hdr}${payload} \ @@ -5508,7 +5508,7 @@ m4_define([GEN_IP_FRAGS], done ip_len=$(printf '%04x' $((40 + frag_len / 2))) - payload=$(printf '0%.0s' $(seq $((frag_len + 40)))) + payload=$(printf '%0*d' $((frag_len + 40)) 0) frag_off=$(printf '%04x' $((62 * frag_len / 8))) AT_CHECK([echo ${hdr}${payload} \ | sed "s/^\(.\{32\}\).\{12\}\(.\{4\}\).\{4\}/\1${ip_len}1234${frag_off}\2dead/"], @@ -5567,7 +5567,7 @@ dnl Make sure all four packets are counted properly in the coverage. AT_CHECK([ovs-appctl coverage/show | grep -c "^ipf.*total: 2"], [0], [2 ]) -zero1208=$(printf '0%.0s' $(seq 2416)) +zero1208=$(printf '%0*d' 2416 0) dnl Test that reassembled packets flow. AT_CHECK([ovs-appctl netdev-dummy/receive p90 "0021853763af 0026b98cb0f9 0800 4500 04c4 0002 2000 40 06 8ff7 ac11370d ac11370b dnl 0000 0001 00000000 00000000 50 10 8000 604c 0000 dnl -- 2.54.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
