From feb8946ff5f0b6813409146a9c0e0915dc602ebd Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 26 Sep 2022 20:43:40 +1000 Subject: test: Simplify data handling for transfer tests Many of our tests are based around performing transfers of sample data across passt/pasta created links. The data flow here can be a bit hard to follow since, e.g. we create a file transfer it to the guest, then transfer it back to the host across several different tests. This also means that the test cases aren't independent of each other. Because we don't have the original file available at both ends in some cases, we compare them by generating md5sums at each end and comparing them, which is a bit complicated. Make a number of changes to simplify this: 1. Pre-generate the sample data files as a test asset, rather than building them on the fly during the tests proper 2. Include the sample data files in the mbuto guest image 3. Because we have good copies of the original data available in all contexts, we can now simply use 'cmp' to check if the transfer has worked, avoiding md5sum complications. 4. Similarly we can always use the original copy of the sample data on the send side of each transfer, meaning that the tests become more independent of each other. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- test/passt.mbuto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/passt.mbuto') diff --git a/test/passt.mbuto b/test/passt.mbuto index 51c9ada..d9cb078 100755 --- a/test/passt.mbuto +++ b/test/passt.mbuto @@ -12,8 +12,8 @@ PROGS="${PROGS:-ash,dash,bash ip mount ls insmod mkdir ln cat chmod lsmod modprobe find grep mknod mv rm umount jq iperf3 dhclient hostname - sed tr chown sipcalc cut md5sum socat dd strace ping tail killall sleep - sysctl nproc tcp_rr tcp_crr udp_rr which tee seq bc sshd ssh-keygen}" + sed tr chown sipcalc cut socat dd strace ping tail killall sleep sysctl + nproc tcp_rr tcp_crr udp_rr which tee seq bc sshd ssh-keygen cmp}" KMODS="${KMODS:- virtio_net virtio_pci vmw_vsock_virtio_transport}" @@ -23,6 +23,8 @@ LINKS="${LINKS:- DIRS="${DIRS} /tmp /sbin /usr/share /var/log /var/lib /etc/ssh /run/sshd /root/.ssh" +COPIES="${COPIES} small.bin,/root/small.bin medium.bin,/root/medium.bin big.bin,/root/big.bin" + FIXUP="${FIXUP}"' cat > /sbin/dhclient-script << EOF #!/bin/sh -- cgit v1.2.3