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

test/lib/setup: Don't rely on IFS to properly separate qemu arguments

Browse source 
...this gets needlessly annoying while playing with test cases.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2022-01-26 07:32:56 +01:00
parent b8307a0a88
commit 4ac48b6eff
1 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
test/lib/setup
View file

@ -52,14 +52,14 @@ setup_passt() {
pane_run PASST "./passt ${__opts} -f -t 10001 -u 10001" pane_run PASST "./passt ${__opts} -f -t 10001 -u 10001"
sleep 1 sleep 1
pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \
'-kernel' "/boot/vmlinuz-$(uname -r)" \ ' -kernel ' "/boot/vmlinuz-$(uname -r)" \
'-initrd mbuto.img -nographic -serial stdio' \ ' -initrd mbuto.img -nographic -serial stdio' \
'-nodefaults ' \ ' -nodefaults' \
'-append "console=ttyS0 mitigations=off apparmor=0 ' \ ' -append "console=ttyS0 mitigations=off apparmor=0 ' \
'virtio-net.napi_tx=1"' \ 'virtio-net.napi_tx=1"' \
"-device virtio-net-pci,netdev=hostnet0,x-txburst=16384"\ " -device virtio-net-pci,netdev=hostnet0,x-txburst=16384" \
"-netdev socket,fd=5,id=hostnet0" " -netdev socket,fd=5,id=hostnet0"
pane_wait GUEST 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" pane_run PASST "./passt -f ${__opts} -t 10001,10011,10021,10031 -u 10001,10011,10021,10031"
sleep 1 sleep 1
pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ pane_run GUEST './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \
'-kernel' "/boot/vmlinuz-$(uname -r)" \ ' -kernel ' "/boot/vmlinuz-$(uname -r)" \
'-initrd mbuto.img -nographic -serial stdio' \ ' -initrd mbuto.img -nographic -serial stdio' \
'-nodefaults ' \ ' -nodefaults' \
'-append "console=ttyS0 mitigations=off apparmor=0 ' \ ' -append "console=ttyS0 mitigations=off apparmor=0 ' \
'virtio-net.napi_tx=1"' \ 'virtio-net.napi_tx=1"' \
"-device virtio-net-pci,netdev=hostnet0,x-txburst=262144"\ " -device virtio-net-pci,netdev=hostnet0,x-txburst=524288" \
"-netdev socket,fd=5,id=hostnet0" " -netdev socket,fd=5,id=hostnet0"
pane_wait GUEST pane_wait GUEST
} }
@ -226,22 +226,22 @@ setup_two_guests() {
pane_run GUEST_2 'cp mbuto.img mbuto_2.img' pane_run GUEST_2 'cp mbuto.img mbuto_2.img'
pane_wait GUEST_2 pane_wait GUEST_2
pane_run GUEST_1 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ pane_run GUEST_1 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \
'-kernel' "/boot/vmlinuz-$(uname -r)" \ ' -kernel ' "/boot/vmlinuz-$(uname -r)" \
'-initrd mbuto.img -nographic -serial stdio' \ ' -initrd mbuto.img -nographic -serial stdio' \
'-nodefaults ' \ ' -nodefaults' \
'-append "console=ttyS0 mitigations=off apparmor=0 ' \ ' -append "console=ttyS0 mitigations=off apparmor=0 ' \
'virtio-net.napi_tx=1"' \ 'virtio-net.napi_tx=1"' \
"-device virtio-net-pci,netdev=hostnet0,x-txburst=16384"\ " -device virtio-net-pci,netdev=hostnet0,x-txburst=16384" \
"-netdev socket,fd=5,id=hostnet0" " -netdev socket,fd=5,id=hostnet0"
pane_run GUEST_2 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \ pane_run GUEST_2 './qrap 5 kvm -m '${VMEM}' -cpu host -smp '${VCPUS} \
'-kernel' "/boot/vmlinuz-$(uname -r)" \ ' -kernel ' "/boot/vmlinuz-$(uname -r)" \
'-initrd mbuto_2.img -nographic -serial stdio' \ ' -initrd mbuto_2.img -nographic -serial stdio' \
'-nodefaults ' \ ' -nodefaults' \
'-append "console=ttyS0 mitigations=off apparmor=0 ' \ ' -append "console=ttyS0 mitigations=off apparmor=0 ' \
'virtio-net.napi_tx=1"' \ 'virtio-net.napi_tx=1"' \
"-device virtio-net-pci,netdev=hostnet0,x-txburst=16384"\ " -device virtio-net-pci,netdev=hostnet0,x-txburst=16384" \
"-netdev socket,fd=5,id=hostnet0" " -netdev socket,fd=5,id=hostnet0"
pane_wait GUEST_1 pane_wait GUEST_1
pane_wait GUEST_2 pane_wait GUEST_2
} }