Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dvp/qvm-usb: ignore whitespaces when comparing output of qvm-usb tools

Browse Source
This commit is contained in:
Alexandre Bezroutchko 2012-10-09 23:25:37 +02:00
parent 1a4dbdacff
commit c71e52a471
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/pvusb-003-list-attach-use-detach
View File

@ -7,7 +7,7 @@ domu='qdvp'
echo 'qvm-usb -l' echo 'qvm-usb -l'
qvm-usb -l | sort > $tmpf qvm-usb -l | sort > $tmpf
cat <<'END' | diff -u - $tmpf cat <<'END' | diff -bu - $tmpf
dom0:2-1 046a:0021 046a_0021 dom0:2-1 046a:0021 046a_0021
dom0:2-2 045e:0745 Microsoft_Microsoft®_Nano_Transceiver_v1.0 dom0:2-2 045e:0745 Microsoft_Microsoft®_Nano_Transceiver_v1.0
dom0:7-1 07d1:3c0a Ralink_11n_Adapter_1.0 dom0:7-1 07d1:3c0a Ralink_11n_Adapter_1.0
@ -16,7 +16,7 @@ END
## === Attach ## === Attach
echo 'qvm-usb -a' echo 'qvm-usb -a'
qvm-usb -a $domu dom0:7-5 | diff -u /dev/null - qvm-usb -a $domu dom0:7-5 | diff -bu /dev/null -
#echo 'pvusb-script/usb-attach.py' #echo 'pvusb-script/usb-attach.py'
#sudo /home/abb/pvusb-scripts/usb-attach.py 7-5 3 1 #sudo /home/abb/pvusb-scripts/usb-attach.py 7-5 3 1
@ -25,7 +25,7 @@ echo 'qvm-usb -l'
qvm-usb -l | sort > $tmpf qvm-usb -l | sort > $tmpf
# FIXME # FIXME
cat <<'END' | diff -u - $tmpf cat <<'END' | diff -bu - $tmpf
dom0:2-1 046a:0021 046a_0021 dom0:2-1 046a:0021 046a_0021
dom0:2-2 045e:0745 Microsoft_Microsoft®_Nano_Transceiver_v1.0 dom0:2-2 045e:0745 Microsoft_Microsoft®_Nano_Transceiver_v1.0
dom0:7-1 07d1:3c0a Ralink_11n_Adapter_1.0 dom0:7-1 07d1:3c0a Ralink_11n_Adapter_1.0
@ -37,7 +37,7 @@ read -p 'Press ENTER to continue'
## === Use: try ls ## === Use: try ls
echo 'qvm-run $domu ls /dev/sda' echo 'qvm-run $domu ls /dev/sda'
qvm-run -p $domu 'ls /dev/sda' > $tmpf qvm-run -p $domu 'ls /dev/sda' > $tmpf
cat <<'END' | diff -u - $tmpf cat <<'END' | diff -bu - $tmpf
/dev/sda /dev/sda
END END
@ -45,7 +45,7 @@ END
echo 'qvm-run $domu fdisk' echo 'qvm-run $domu fdisk'
qvm-run -p $domu 'su - root -c "fdisk -l /dev/sda"' > $tmpf qvm-run -p $domu 'su - root -c "fdisk -l /dev/sda"' > $tmpf
cat <<'END' | diff -u - $tmpf cat <<'END' | diff -bu - $tmpf
Disk /dev/sda: 4022 MB, 4022337024 bytes Disk /dev/sda: 4022 MB, 4022337024 bytes
124 heads, 62 sectors/track, 1021 cylinders, total 7856127 sectors 124 heads, 62 sectors/track, 1021 cylinders, total 7856127 sectors
@ -60,7 +60,7 @@ END
## === Detach ## === Detach
#echo 'qvm-usb -d' #echo 'qvm-usb -d'
#qvm-usb -d $domu:7-5 | diff -u /dev/null - #qvm-usb -d $domu:7-5 | diff -bu /dev/null -
echo 'pvusb-script/usb-detach.py' echo 'pvusb-script/usb-detach.py'
sudo /home/abb/pvusb-scripts/usb-detach.py 7-5 4 1 sudo /home/abb/pvusb-scripts/usb-detach.py 7-5 4 1