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

test/demo: Use relative paths to change directories when possible

Browse source 
A cd to __STATEDIR__ results in a rather long command, that's not
very readable. Jump between directories using .. and relative paths,
once we're there.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2022-09-24 00:05:20 +02:00
parent 57fa9dd4c9
commit 6d08bfc3e0
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
test/demo/passt
View file

@ -53,8 +53,7 @@ nl
say Let's create a small initramfs image for the guest. say Let's create a small initramfs image for the guest.
guest cd __STATEDIR__ guest cd __STATEDIR__
guest git clone git://mbuto.sh/mbuto guest git clone git://mbuto.sh/mbuto
guest cd mbuto guest ./mbuto/mbuto -f passt.img -p passt/test/passt.mbuto -c lz4
guest ./mbuto -f passt.img -p __STATEDIR__/passt/test/passt.mbuto -c lz4
sleep 2 sleep 2
nl nl
@ -82,7 +81,7 @@ say Now let's run 'passt' in the new namespace, and
nl nl
say enter this namespace from the guest terminal too. say enter this namespace from the guest terminal too.
sleep 3 sleep 3
guest cd __STATEDIR__/passt guest cd passt
gout TARGET_PID pgrep -P $(cat pasta.pid) gout TARGET_PID pgrep -P $(cat pasta.pid)
sleep 1 sleep 1
@ -101,7 +100,7 @@ nl
say back-end to passt's UNIX domain socket. say back-end to passt's UNIX domain socket.
sleep 2 sleep 2
hout VMLINUZ echo "/boot/vmlinuz-$(uname -r)" hout VMLINUZ echo "/boot/vmlinuz-$(uname -r)"
guest ../passt/qrap 5 qemu-system-x86_64 -enable-kvm -m 4096 -cpu host -smp 4 -kernel __VMLINUZ__ -initrd passt.img -nographic -serial stdio -nodefaults -append "console=ttyS0 virtio-net.napi_tx=1" -device virtio-net-pci,netdev=hostnet0,x-txburst=16384 -netdev socket,fd=5,id=hostnet0 guest ./qrap 5 qemu-system-x86_64 -enable-kvm -m 4096 -cpu host -smp 4 -kernel __VMLINUZ__ -initrd ../passt.img -nographic -serial stdio -nodefaults -append "console=ttyS0 virtio-net.napi_tx=1" -device virtio-net-pci,netdev=hostnet0,x-txburst=16384 -netdev socket,fd=5,id=hostnet0
sleep 10 sleep 10
nl nl

4
test/demo/pasta
View file

@ -140,12 +140,12 @@ say can also take packet captures.
sleep 3 sleep 3
passt exit passt exit
sleep 2 sleep 2
passtb ./pasta -p __STATEDIR__/demo_pasta.pcap passtb ./pasta -p ../demo_pasta.pcap
sleep 2 sleep 2
passt passt
passt /sbin/dhclient -4 --no-pid passt /sbin/dhclient -4 --no-pid
sleep 2 sleep 2
hostb tshark -r __STATEDIR__/demo_pasta.pcap hostb tshark -r ../demo_pasta.pcap
sleep 5 sleep 5
nl nl