diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2022-01-26 07:32:56 +0100 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2022-01-26 16:30:59 +0100 |
| commit | 4ac48b6eff8e238d9a1713c49c2ddd33984c2190 (patch) | |
| tree | ada8835e8517d10ade62b63d04f46eb5d8895061 /test/lib/setup | |
| parent | b8307a0a881404e77ad82be8bdba8f679c8ebeb4 (diff) | |
| download | passt-4ac48b6eff8e238d9a1713c49c2ddd33984c2190.tar passt-4ac48b6eff8e238d9a1713c49c2ddd33984c2190.tar.gz passt-4ac48b6eff8e238d9a1713c49c2ddd33984c2190.tar.bz2 passt-4ac48b6eff8e238d9a1713c49c2ddd33984c2190.tar.lz passt-4ac48b6eff8e238d9a1713c49c2ddd33984c2190.tar.xz passt-4ac48b6eff8e238d9a1713c49c2ddd33984c2190.tar.zst passt-4ac48b6eff8e238d9a1713c49c2ddd33984c2190.zip | |
test/lib/setup: Don't rely on IFS to properly separate qemu arguments
...this gets needlessly annoying while playing with test cases.
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'test/lib/setup')
| -rwxr-xr-x | test/lib/setup | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/test/lib/setup b/test/lib/setup index 124e35b..ab51787 100755 --- a/test/lib/setup +++ b/test/lib/setup @@ -52,14 +52,14 @@ setup_passt() { pane_run PASST "./passt ${__opts} -f -t 10001 -u 10001" sleep 1 - pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ - '-kernel' "/boot/vmlinuz-$(uname -r)" \ - '-initrd mbuto.img -nographic -serial stdio' \ - '-nodefaults ' \ - '-append "console=ttyS0 mitigations=off apparmor=0 ' \ - 'virtio-net.napi_tx=1"' \ - "-device virtio-net-pci,netdev=hostnet0,x-txburst=16384"\ - "-netdev socket,fd=5,id=hostnet0" + pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ + ' -kernel ' "/boot/vmlinuz-$(uname -r)" \ + ' -initrd mbuto.img -nographic -serial stdio' \ + ' -nodefaults' \ + ' -append "console=ttyS0 mitigations=off apparmor=0 ' \ + 'virtio-net.napi_tx=1"' \ + " -device virtio-net-pci,netdev=hostnet0,x-txburst=16384" \ + " -netdev socket,fd=5,id=hostnet0" pane_wait GUEST } @@ -145,14 +145,14 @@ setup_passt_in_ns() { pane_run PASST "./passt -f ${__opts} -t 10001,10011,10021,10031 -u 10001,10011,10021,10031" sleep 1 - pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ - '-kernel' "/boot/vmlinuz-$(uname -r)" \ - '-initrd mbuto.img -nographic -serial stdio' \ - '-nodefaults ' \ - '-append "console=ttyS0 mitigations=off apparmor=0 ' \ - 'virtio-net.napi_tx=1"' \ - "-device virtio-net-pci,netdev=hostnet0,x-txburst=262144"\ - "-netdev socket,fd=5,id=hostnet0" + pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ + ' -kernel ' "/boot/vmlinuz-$(uname -r)" \ + ' -initrd mbuto.img -nographic -serial stdio' \ + ' -nodefaults' \ + ' -append "console=ttyS0 mitigations=off apparmor=0 ' \ + 'virtio-net.napi_tx=1"' \ + " -device virtio-net-pci,netdev=hostnet0,x-txburst=524288" \ + " -netdev socket,fd=5,id=hostnet0" pane_wait GUEST } @@ -226,22 +226,22 @@ setup_two_guests() { pane_run GUEST_2 'cp mbuto.img mbuto_2.img' pane_wait GUEST_2 - pane_run GUEST_1 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ - '-kernel' "/boot/vmlinuz-$(uname -r)" \ - '-initrd mbuto.img -nographic -serial stdio' \ - '-nodefaults ' \ - '-append "console=ttyS0 mitigations=off apparmor=0 ' \ - 'virtio-net.napi_tx=1"' \ - "-device virtio-net-pci,netdev=hostnet0,x-txburst=16384"\ - "-netdev socket,fd=5,id=hostnet0" - pane_run GUEST_2 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ - '-kernel' "/boot/vmlinuz-$(uname -r)" \ - '-initrd mbuto_2.img -nographic -serial stdio' \ - '-nodefaults ' \ - '-append "console=ttyS0 mitigations=off apparmor=0 ' \ - 'virtio-net.napi_tx=1"' \ - "-device virtio-net-pci,netdev=hostnet0,x-txburst=16384"\ - "-netdev socket,fd=5,id=hostnet0" + pane_run GUEST_1 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ + ' -kernel ' "/boot/vmlinuz-$(uname -r)" \ + ' -initrd mbuto.img -nographic -serial stdio' \ + ' -nodefaults' \ + ' -append "console=ttyS0 mitigations=off apparmor=0 ' \ + 'virtio-net.napi_tx=1"' \ + " -device virtio-net-pci,netdev=hostnet0,x-txburst=16384" \ + " -netdev socket,fd=5,id=hostnet0" + pane_run GUEST_2 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ + ' -kernel ' "/boot/vmlinuz-$(uname -r)" \ + ' -initrd mbuto_2.img -nographic -serial stdio' \ + ' -nodefaults' \ + ' -append "console=ttyS0 mitigations=off apparmor=0 ' \ + 'virtio-net.napi_tx=1"' \ + " -device virtio-net-pci,netdev=hostnet0,x-txburst=16384" \ + " -netdev socket,fd=5,id=hostnet0" pane_wait GUEST_1 pane_wait GUEST_2 } |