mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Remove unnecessary truncation of temporary files in udp tests

Browse source 
All the UDP tests use :> to truncate some temporary data files.  This
appears to be so that they're empty before writing data to them with tee.
However tee, by default, truncates its output file anyway (you need tee -a
to append).  So drop the unnecessary truncations.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2022-07-15 15:21:36 +10:00 committed by Stefano Brivio
parent d078a1113f
commit ada08d4735
3 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/udp/passt
View file

@ -26,7 +26,6 @@ gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1
check [ "__GUEST_MD5__" = "__HOST_MD5__" ] check [ "__GUEST_MD5__" = "__HOST_MD5__" ]
test UDP/IPv4: guest to host test UDP/IPv4: guest to host
host :> __TEMP__
hostb (socat -u UDP4-LISTEN:10003,bind=127.0.0.1 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) hostb (socat -u UDP4-LISTEN:10003,bind=127.0.0.1 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway'
guest socat -u OPEN:test.bin UDP4:__GW__:10003 guest socat -u OPEN:test.bin UDP4:__GW__:10003
@ -43,7 +42,6 @@ gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1
check [ "__GUEST_MD5__" = "__HOST_MD5__" ] check [ "__GUEST_MD5__" = "__HOST_MD5__" ]
test UDP/IPv6: guest to host test UDP/IPv6: guest to host
host :> __TEMP__
hostb (socat -u UDP6-LISTEN:10003,bind=[::1] STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) hostb (socat -u UDP6-LISTEN:10003,bind=[::1] STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway'
gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname'

10
test/udp/passt_in_ns
View file

@ -28,7 +28,6 @@ check [ "__GUEST_MD5__" = "__MD5__" ]
test UDP/IPv4: host to ns test UDP/IPv4: host to ns
temp TEMP_NS temp TEMP_NS
ns :> __TEMP_NS__
nsb (socat -u UDP4-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) nsb (socat -u UDP4-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10002 host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10002
nsw nsw
@ -36,7 +35,6 @@ nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1
check [ "__NS_MD5__" = "__MD5__" ] check [ "__NS_MD5__" = "__MD5__" ]
test UDP/IPv4: guest to host test UDP/IPv4: guest to host
host :> __TEMP__
hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway'
guest socat -u OPEN:test.bin UDP4:__GW__:10003 guest socat -u OPEN:test.bin UDP4:__GW__:10003
@ -45,7 +43,6 @@ hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv4: guest to ns test UDP/IPv4: guest to ns
ns :> __TEMP_NS__
nsb (socat -u UDP4-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) nsb (socat -u UDP4-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
guest socat -u OPEN:test.bin UDP4:__GW__:10002 guest socat -u OPEN:test.bin UDP4:__GW__:10002
hostw hostw
@ -54,7 +51,6 @@ check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv4: ns to host (recvmmsg/sendmmsg) test UDP/IPv4: ns to host (recvmmsg/sendmmsg)
sleep 1 sleep 1
host :> __TEMP__
hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
ns socat -u OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003 ns socat -u OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003
hostw hostw
@ -62,7 +58,6 @@ hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv4: ns to host (via tap) test UDP/IPv4: ns to host (via tap)
host :> __TEMP__
hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
ns socat -u OPEN:__TEMP_NS__ UDP4:__GW__:10003 ns socat -u OPEN:__TEMP_NS__ UDP4:__GW__:10003
hostw hostw
@ -93,7 +88,6 @@ gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1
check [ "__GUEST_MD5__" = "__MD5__" ] check [ "__GUEST_MD5__" = "__MD5__" ]
test UDP/IPv6: host to ns test UDP/IPv6: host to ns
ns :> __TEMP_NS__
nsb (socat -u UDP6-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) nsb (socat -u UDP6-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
host socat -u OPEN:__TEMP__ UDP6:[::1]:10002 host socat -u OPEN:__TEMP__ UDP6:[::1]:10002
nsw nsw
@ -101,7 +95,6 @@ nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1
check [ "__NS_MD5__" = "__MD5__" ] check [ "__NS_MD5__" = "__MD5__" ]
test UDP/IPv6: guest to host test UDP/IPv6: guest to host
host :> __TEMP__
hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway'
gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname'
@ -111,7 +104,6 @@ hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv6: guest to ns test UDP/IPv6: guest to ns
ns :> __TEMP_NS__
nsb (socat -u UDP6-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) nsb (socat -u UDP6-LISTEN:10002 STDOUT & echo $! > __SC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10002 guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10002
hostw hostw
@ -119,7 +111,6 @@ hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv6: ns to host (recvmmsg/sendmmsg) test UDP/IPv6: ns to host (recvmmsg/sendmmsg)
host :> __TEMP__
hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003 ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003
hostw hostw
@ -127,7 +118,6 @@ hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv6: ns to host (via tap) test UDP/IPv6: ns to host (via tap)
host :> __TEMP__
hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__))
nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname'
ns socat -u OPEN:__TEMP_NS__ UDP6:[__GW6__%__IFNAME__]:10003 ns socat -u OPEN:__TEMP_NS__ UDP6:[__GW6__%__IFNAME__]:10003

6
test/udp/pasta
View file

@ -18,7 +18,6 @@ test UDP/IPv4: host to ns
temp TEMP temp TEMP
temp TEMP_NS temp TEMP_NS
temp NC_PID temp NC_PID
ns :> __TEMP_NS__
nsb (socat -u UDP4-LISTEN:10002,bind=127.0.0.1 STDOUT & echo $! > __NC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) nsb (socat -u UDP4-LISTEN:10002,bind=127.0.0.1 STDOUT & echo $! > __NC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__))
host dd if=/dev/urandom bs=1k count=5 > __TEMP__ && printf "\nEND_OF_TEST\n" >> __TEMP__ host dd if=/dev/urandom bs=1k count=5 > __TEMP__ && printf "\nEND_OF_TEST\n" >> __TEMP__
@ -29,7 +28,6 @@ nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1
check [ "__NS_MD5__" = "__MD5__" ] check [ "__NS_MD5__" = "__MD5__" ]
test UDP/IPv4: ns to host (recvmmsg/sendmmsg) test UDP/IPv4: ns to host (recvmmsg/sendmmsg)
host :> __TEMP__
hostb (socat -u UDP4-LISTEN:10003,bind=127.0.0.1 STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) hostb (socat -u UDP4-LISTEN:10003,bind=127.0.0.1 STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__))
sleep 1 sleep 1
ns socat OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003 ns socat OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003
@ -38,7 +36,6 @@ hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv4: ns to host (via tap) test UDP/IPv4: ns to host (via tap)
host :> __TEMP__
hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) hostb (socat -u UDP4-LISTEN:10003 STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__))
nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway'
ns socat -u OPEN:__TEMP_NS__ UDP4:__GW__:10003 ns socat -u OPEN:__TEMP_NS__ UDP4:__GW__:10003
@ -47,7 +44,6 @@ hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1
check [ "__HOST_MD5__" = "__MD5__" ] check [ "__HOST_MD5__" = "__MD5__" ]
test UDP/IPv6: host to ns test UDP/IPv6: host to ns
ns :> __TEMP_NS__
nsb (socat -u UDP6-LISTEN:10002,bind=[::1] STDOUT & echo $! > __NC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) nsb (socat -u UDP6-LISTEN:10002,bind=[::1] STDOUT & echo $! > __NC_PID__) | tee __TEMP_NS__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__))
host socat -u OPEN:__TEMP__ UDP6:[::1]:10002 host socat -u OPEN:__TEMP__ UDP6:[::1]:10002
nsw nsw
@ -56,7 +52,6 @@ nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1
check [ "__NS_MD5__" = "__MD5__" ] check [ "__NS_MD5__" = "__MD5__" ]
test UDP/IPv6: ns to host (recvmmsg/sendmmsg) test UDP/IPv6: ns to host (recvmmsg/sendmmsg)
host :> __TEMP__
hostb (socat -u UDP6-LISTEN:10003,bind=[::1] STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) hostb (socat -u UDP6-LISTEN:10003,bind=[::1] STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__))
sleep 1 sleep 1
ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003 ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003
@ -66,7 +61,6 @@ check [ "__HOST_MD5__" = "__MD5__" ]
nsw nsw
test UDP/IPv6: ns to host (via tap) test UDP/IPv6: ns to host (via tap)
host :> __TEMP__
hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) hostb (socat -u UDP6-LISTEN:10003 STDOUT & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__))
nsout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' nsout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway'
nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname'