From 827b71acfa8d6380c27c6bf1f9375ee7a187dd4d Mon Sep 17 00:00:00 2001 From: Alexandre Bezroutchko Date: Sun, 7 Oct 2012 22:11:51 +0200 Subject: [PATCH] dvp/qvm-usb: changed order of diff arguments in all test scripts, for clearer output --- test/block-001-list-attach-use-detach | 6 +++--- test/pvusb-001-mouse-kbd-attached | 2 +- test/pvusb-002-mouse-kbd-usbstick-wlan-attached | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/block-001-list-attach-use-detach b/test/block-001-list-attach-use-detach index ec52a18..84be5fb 100755 --- a/test/block-001-list-attach-use-detach +++ b/test/block-001-list-attach-use-detach @@ -6,7 +6,7 @@ tmpf=`mktemp` echo 'qvm-block -l' qvm-block -l > $tmpf -cat <<'END' | diff -u $tmpf - +cat <<'END' | diff -u - $tmpf netvm:sda STORAGE_DEVICE () 0 B dom0:sdb1 Cruzer () 3 GiB dom0:sdb Cruzer () 3 GiB @@ -20,7 +20,7 @@ qvm-block -a work dom0:sdb | diff -u /dev/null - echo 'qvm-block -l' qvm-block -l > $tmpf -cat <<'END' | diff -u $tmpf - +cat <<'END' | diff -u - $tmpf netvm:sda STORAGE_DEVICE () 0 B dom0:sdb1 Cruzer () 3 GiB dom0:sdb Cruzer () 3 GiB (attached to 'work' as 'xvdi') @@ -30,7 +30,7 @@ END echo 'qvm-run work fdisk' qvm-run -qp work 'su - root -c "fdisk -l /dev/xvdi"' > $tmpf -cat <<'END' | diff -u $tmpf - +cat <<'END' | diff -u - $tmpf Disk /dev/xvdi: 4022 MB, 4022337024 bytes 124 heads, 62 sectors/track, 1021 cylinders, total 7856127 sectors diff --git a/test/pvusb-001-mouse-kbd-attached b/test/pvusb-001-mouse-kbd-attached index 8011b64..8e21edc 100755 --- a/test/pvusb-001-mouse-kbd-attached +++ b/test/pvusb-001-mouse-kbd-attached @@ -4,7 +4,7 @@ tmpf=`mktemp` sudo xenstore-ls -f qubes-usb-devices | sort > $tmpf -cat << 'END' | diff -u $tmpf - +cat << 'END' | diff -u - $tmpf qubes-usb-devices/045e_0745 = "" qubes-usb-devices/045e_0745/desc = "045e_0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0" qubes-usb-devices/046a_0021 = "" diff --git a/test/pvusb-002-mouse-kbd-usbstick-wlan-attached b/test/pvusb-002-mouse-kbd-usbstick-wlan-attached index 66b78aa..ad595da 100755 --- a/test/pvusb-002-mouse-kbd-usbstick-wlan-attached +++ b/test/pvusb-002-mouse-kbd-usbstick-wlan-attached @@ -4,7 +4,7 @@ tmpf=`mktemp` sudo xenstore-ls -f qubes-usb-devices | sort > $tmpf -cat << 'END' | diff -u $tmpf - +cat << 'END' | diff -u - $tmpf qubes-usb-devices/045e_0745 = "" qubes-usb-devices/045e_0745/desc = "045e_0745 Microsoft_Microsoft\xc2\xae_Nano_Transceiver_v1.0" qubes-usb-devices/046a_0021 = ""