* [Qemu-devel] [PATCH v2 0/3] Do some cleaning work in qemu-iotests
@ 2018-10-24 9:40 Mao Zhongyi
2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD Mao Zhongyi
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Mao Zhongyi @ 2018-10-24 9:40 UTC (permalink / raw)
To: qemu-devel; +Cc: Mao Zhongyi, kwolf, mreitz, eblake
POSIX requires $PWD to be reliable, and we expect all
shells used by qemu scripts to be relatively close to
POSIX. Thus, it is smarter to avoid forking the pwd
executable for something that is already available in
the environment.
In addtion, clean up unused variable here and use $()
to instead of obsolete `` in some script files.
v2:
-add patch2
-split the patch1 of v1 into patch1 and patch3
[ Eric Blake ]
Cc: kwolf@redhat.com
Cc: mreitz@redhat.com
Cc: eblake@redhat.com
Mao Zhongyi (3):
qemu-iotests: convert `pwd` and $(pwd) to $PWD
qemu-iotests: remove unused variable here
qemu-iotests: Modern shell scripting (use $() instead of ``)
configure | 2 +-
tests/check-block.sh | 6 ++--
tests/qemu-iotests/001 | 1 -
tests/qemu-iotests/002 | 1 -
tests/qemu-iotests/003 | 1 -
tests/qemu-iotests/004 | 1 -
tests/qemu-iotests/005 | 1 -
tests/qemu-iotests/007 | 1 -
tests/qemu-iotests/008 | 1 -
tests/qemu-iotests/009 | 1 -
tests/qemu-iotests/010 | 1 -
tests/qemu-iotests/011 | 1 -
tests/qemu-iotests/012 | 1 -
tests/qemu-iotests/013 | 1 -
tests/qemu-iotests/014 | 1 -
tests/qemu-iotests/015 | 1 -
tests/qemu-iotests/017 | 1 -
tests/qemu-iotests/018 | 1 -
tests/qemu-iotests/019 | 1 -
tests/qemu-iotests/020 | 1 -
tests/qemu-iotests/021 | 1 -
tests/qemu-iotests/022 | 1 -
tests/qemu-iotests/023 | 1 -
tests/qemu-iotests/024 | 1 -
tests/qemu-iotests/025 | 1 -
tests/qemu-iotests/026 | 1 -
tests/qemu-iotests/027 | 1 -
tests/qemu-iotests/028 | 1 -
tests/qemu-iotests/029 | 1 -
tests/qemu-iotests/031 | 1 -
tests/qemu-iotests/032 | 1 -
tests/qemu-iotests/033 | 1 -
tests/qemu-iotests/034 | 1 -
tests/qemu-iotests/035 | 1 -
tests/qemu-iotests/036 | 1 -
tests/qemu-iotests/037 | 1 -
tests/qemu-iotests/038 | 1 -
tests/qemu-iotests/039 | 1 -
tests/qemu-iotests/042 | 1 -
tests/qemu-iotests/043 | 1 -
tests/qemu-iotests/046 | 1 -
tests/qemu-iotests/047 | 1 -
tests/qemu-iotests/049 | 1 -
tests/qemu-iotests/050 | 1 -
tests/qemu-iotests/051 | 1 -
tests/qemu-iotests/052 | 1 -
tests/qemu-iotests/053 | 1 -
tests/qemu-iotests/054 | 1 -
tests/qemu-iotests/058 | 1 -
tests/qemu-iotests/059 | 1 -
tests/qemu-iotests/060 | 1 -
tests/qemu-iotests/061 | 1 -
tests/qemu-iotests/062 | 1 -
tests/qemu-iotests/063 | 1 -
tests/qemu-iotests/064 | 1 -
tests/qemu-iotests/066 | 1 -
tests/qemu-iotests/067 | 1 -
tests/qemu-iotests/068 | 1 -
tests/qemu-iotests/069 | 1 -
tests/qemu-iotests/070 | 1 -
tests/qemu-iotests/071 | 1 -
tests/qemu-iotests/072 | 1 -
tests/qemu-iotests/073 | 1 -
tests/qemu-iotests/075 | 1 -
tests/qemu-iotests/076 | 1 -
tests/qemu-iotests/077 | 1 -
tests/qemu-iotests/078 | 1 -
tests/qemu-iotests/079 | 1 -
tests/qemu-iotests/080 | 1 -
tests/qemu-iotests/081 | 1 -
tests/qemu-iotests/082 | 1 -
tests/qemu-iotests/083 | 1 -
tests/qemu-iotests/084 | 1 -
tests/qemu-iotests/085 | 1 -
tests/qemu-iotests/086 | 1 -
tests/qemu-iotests/087 | 1 -
tests/qemu-iotests/088 | 1 -
tests/qemu-iotests/089 | 1 -
tests/qemu-iotests/090 | 1 -
tests/qemu-iotests/091 | 1 -
tests/qemu-iotests/092 | 1 -
tests/qemu-iotests/094 | 1 -
tests/qemu-iotests/095 | 1 -
tests/qemu-iotests/097 | 1 -
tests/qemu-iotests/098 | 1 -
tests/qemu-iotests/099 | 1 -
tests/qemu-iotests/101 | 1 -
tests/qemu-iotests/102 | 1 -
tests/qemu-iotests/103 | 1 -
tests/qemu-iotests/104 | 1 -
tests/qemu-iotests/105 | 1 -
tests/qemu-iotests/106 | 1 -
tests/qemu-iotests/107 | 1 -
tests/qemu-iotests/108 | 1 -
tests/qemu-iotests/109 | 1 -
tests/qemu-iotests/110 | 1 -
tests/qemu-iotests/111 | 1 -
tests/qemu-iotests/112 | 1 -
tests/qemu-iotests/113 | 1 -
tests/qemu-iotests/114 | 1 -
tests/qemu-iotests/115 | 1 -
tests/qemu-iotests/116 | 1 -
tests/qemu-iotests/117 | 1 -
tests/qemu-iotests/119 | 1 -
tests/qemu-iotests/120 | 1 -
tests/qemu-iotests/121 | 1 -
tests/qemu-iotests/122 | 1 -
tests/qemu-iotests/123 | 1 -
tests/qemu-iotests/125 | 1 -
tests/qemu-iotests/126 | 1 -
tests/qemu-iotests/127 | 1 -
tests/qemu-iotests/128 | 1 -
tests/qemu-iotests/130 | 1 -
tests/qemu-iotests/131 | 1 -
tests/qemu-iotests/133 | 1 -
tests/qemu-iotests/134 | 1 -
tests/qemu-iotests/135 | 1 -
tests/qemu-iotests/137 | 1 -
tests/qemu-iotests/138 | 1 -
tests/qemu-iotests/140 | 1 -
tests/qemu-iotests/141 | 1 -
tests/qemu-iotests/142 | 1 -
tests/qemu-iotests/143 | 1 -
tests/qemu-iotests/144 | 1 -
tests/qemu-iotests/145 | 1 -
tests/qemu-iotests/146 | 1 -
tests/qemu-iotests/150 | 1 -
tests/qemu-iotests/153 | 1 -
tests/qemu-iotests/154 | 1 -
tests/qemu-iotests/156 | 1 -
tests/qemu-iotests/157 | 1 -
tests/qemu-iotests/158 | 1 -
tests/qemu-iotests/159 | 1 -
tests/qemu-iotests/160 | 1 -
tests/qemu-iotests/162 | 1 -
tests/qemu-iotests/170 | 1 -
tests/qemu-iotests/171 | 1 -
tests/qemu-iotests/172 | 1 -
tests/qemu-iotests/173 | 1 -
tests/qemu-iotests/174 | 1 -
tests/qemu-iotests/175 | 1 -
tests/qemu-iotests/176 | 1 -
tests/qemu-iotests/177 | 1 -
tests/qemu-iotests/178 | 1 -
tests/qemu-iotests/179 | 1 -
tests/qemu-iotests/181 | 1 -
tests/qemu-iotests/182 | 1 -
tests/qemu-iotests/183 | 1 -
tests/qemu-iotests/184 | 1 -
tests/qemu-iotests/185 | 1 -
tests/qemu-iotests/186 | 1 -
tests/qemu-iotests/187 | 1 -
tests/qemu-iotests/188 | 1 -
tests/qemu-iotests/189 | 1 -
tests/qemu-iotests/190 | 1 -
tests/qemu-iotests/191 | 1 -
tests/qemu-iotests/192 | 1 -
tests/qemu-iotests/195 | 1 -
tests/qemu-iotests/197 | 1 -
tests/qemu-iotests/198 | 1 -
tests/qemu-iotests/200 | 1 -
tests/qemu-iotests/204 | 1 -
tests/qemu-iotests/214 | 1 -
tests/qemu-iotests/215 | 1 -
tests/qemu-iotests/221 | 1 -
tests/qemu-iotests/223 | 1 -
tests/qemu-iotests/225 | 1 -
tests/qemu-iotests/226 | 1 -
tests/qemu-iotests/227 | 1 -
tests/qemu-iotests/229 | 1 -
tests/qemu-iotests/231 | 1 -
tests/qemu-iotests/check | 62 ++++++++++++++++----------------
tests/qemu-iotests/common.config | 6 ++--
tests/qemu-iotests/common.rc | 2 +-
174 files changed, 39 insertions(+), 208 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD 2018-10-24 9:40 [Qemu-devel] [PATCH v2 0/3] Do some cleaning work in qemu-iotests Mao Zhongyi @ 2018-10-24 9:40 ` Mao Zhongyi 2018-11-16 16:53 ` Eric Blake 2018-11-16 20:46 ` Eric Blake 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here Mao Zhongyi 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 3/3] qemu-iotests: Modern shell scripting (use $() instead of ``) Mao Zhongyi 2 siblings, 2 replies; 11+ messages in thread From: Mao Zhongyi @ 2018-10-24 9:40 UTC (permalink / raw) To: qemu-devel; +Cc: Mao Zhongyi, kwolf, mreitz, eblake POSIX requires $PWD to be reliable, and we expect all shells used by qemu scripts to be relatively close to POSIX. Thus, it is smarter to avoid forking the pwd executable for something that is already available in the environment. So replac it with the following: sed -i 's/`pwd`/$PWD/g' $(git grep -l "\`pwd\`") sed -i 's/$(pwd)/$PWD/g' $(git grep -l "\$(pwd)") The remaining small parts are manually modified. Cc: kwolf@redhat.com Cc: mreitz@redhat.com Cc: eblake@redhat.com Suggested-by: Eric Blake <eblake@redhat.com> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> --- configure | 2 +- tests/check-block.sh | 6 +++--- tests/qemu-iotests/001 | 2 +- tests/qemu-iotests/002 | 2 +- tests/qemu-iotests/003 | 2 +- tests/qemu-iotests/004 | 2 +- tests/qemu-iotests/005 | 2 +- tests/qemu-iotests/007 | 2 +- tests/qemu-iotests/008 | 2 +- tests/qemu-iotests/009 | 2 +- tests/qemu-iotests/010 | 2 +- tests/qemu-iotests/011 | 2 +- tests/qemu-iotests/012 | 2 +- tests/qemu-iotests/013 | 2 +- tests/qemu-iotests/014 | 2 +- tests/qemu-iotests/015 | 2 +- tests/qemu-iotests/017 | 2 +- tests/qemu-iotests/018 | 2 +- tests/qemu-iotests/019 | 2 +- tests/qemu-iotests/020 | 2 +- tests/qemu-iotests/021 | 2 +- tests/qemu-iotests/022 | 2 +- tests/qemu-iotests/023 | 2 +- tests/qemu-iotests/024 | 2 +- tests/qemu-iotests/025 | 2 +- tests/qemu-iotests/026 | 2 +- tests/qemu-iotests/027 | 2 +- tests/qemu-iotests/028 | 2 +- tests/qemu-iotests/029 | 2 +- tests/qemu-iotests/031 | 2 +- tests/qemu-iotests/032 | 2 +- tests/qemu-iotests/033 | 2 +- tests/qemu-iotests/034 | 2 +- tests/qemu-iotests/035 | 2 +- tests/qemu-iotests/036 | 2 +- tests/qemu-iotests/037 | 2 +- tests/qemu-iotests/038 | 2 +- tests/qemu-iotests/039 | 2 +- tests/qemu-iotests/042 | 2 +- tests/qemu-iotests/043 | 2 +- tests/qemu-iotests/046 | 2 +- tests/qemu-iotests/047 | 2 +- tests/qemu-iotests/049 | 2 +- tests/qemu-iotests/050 | 2 +- tests/qemu-iotests/051 | 2 +- tests/qemu-iotests/052 | 2 +- tests/qemu-iotests/053 | 2 +- tests/qemu-iotests/054 | 2 +- tests/qemu-iotests/058 | 2 +- tests/qemu-iotests/059 | 2 +- tests/qemu-iotests/061 | 2 +- tests/qemu-iotests/062 | 2 +- tests/qemu-iotests/063 | 2 +- tests/qemu-iotests/064 | 2 +- tests/qemu-iotests/067 | 2 +- tests/qemu-iotests/070 | 2 +- tests/qemu-iotests/073 | 2 +- tests/qemu-iotests/075 | 2 +- tests/qemu-iotests/076 | 2 +- tests/qemu-iotests/077 | 2 +- tests/qemu-iotests/078 | 2 +- tests/qemu-iotests/079 | 2 +- tests/qemu-iotests/080 | 2 +- tests/qemu-iotests/081 | 2 +- tests/qemu-iotests/082 | 2 +- tests/qemu-iotests/083 | 2 +- tests/qemu-iotests/084 | 2 +- tests/qemu-iotests/085 | 2 +- tests/qemu-iotests/086 | 2 +- tests/qemu-iotests/087 | 2 +- tests/qemu-iotests/088 | 2 +- tests/qemu-iotests/091 | 2 +- tests/qemu-iotests/092 | 2 +- tests/qemu-iotests/095 | 2 +- tests/qemu-iotests/101 | 2 +- tests/qemu-iotests/104 | 2 +- tests/qemu-iotests/105 | 2 +- tests/qemu-iotests/116 | 2 +- tests/qemu-iotests/128 | 2 +- tests/qemu-iotests/131 | 2 +- tests/qemu-iotests/133 | 2 +- tests/qemu-iotests/134 | 2 +- tests/qemu-iotests/135 | 2 +- tests/qemu-iotests/142 | 2 +- tests/qemu-iotests/144 | 2 +- tests/qemu-iotests/145 | 2 +- tests/qemu-iotests/146 | 2 +- tests/qemu-iotests/154 | 2 +- tests/qemu-iotests/158 | 2 +- tests/qemu-iotests/171 | 2 +- tests/qemu-iotests/172 | 2 +- tests/qemu-iotests/173 | 2 +- tests/qemu-iotests/174 | 2 +- tests/qemu-iotests/175 | 2 +- tests/qemu-iotests/177 | 2 +- tests/qemu-iotests/178 | 2 +- tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/183 | 2 +- tests/qemu-iotests/184 | 2 +- tests/qemu-iotests/185 | 2 +- tests/qemu-iotests/186 | 2 +- tests/qemu-iotests/187 | 2 +- tests/qemu-iotests/188 | 2 +- tests/qemu-iotests/189 | 2 +- tests/qemu-iotests/190 | 2 +- tests/qemu-iotests/191 | 2 +- tests/qemu-iotests/192 | 2 +- tests/qemu-iotests/195 | 2 +- tests/qemu-iotests/198 | 2 +- tests/qemu-iotests/200 | 2 +- tests/qemu-iotests/204 | 2 +- tests/qemu-iotests/226 | 2 +- tests/qemu-iotests/231 | 2 +- tests/qemu-iotests/check | 2 +- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.rc | 2 +- 116 files changed, 118 insertions(+), 118 deletions(-) diff --git a/configure b/configure index e39f63d01d..3a4f6e1ff0 100755 --- a/configure +++ b/configure @@ -868,7 +868,7 @@ Linux) vhost_crypto="yes" vhost_scsi="yes" vhost_vsock="yes" - QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES" + QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$PWD/linux-headers $QEMU_INCLUDES" supported_os="yes" ;; esac diff --git a/tests/check-block.sh b/tests/check-block.sh index c3de3789c4..f3d12fd602 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -5,9 +5,9 @@ if [ "$#" -ne 0 ]; then FORMAT_LIST="$@" fi -export QEMU_PROG="$(pwd)/x86_64-softmmu/qemu-system-x86_64" -export QEMU_IMG_PROG="$(pwd)/qemu-img" -export QEMU_IO_PROG="$(pwd)/qemu-io" +export QEMU_PROG="$PWD/x86_64-softmmu/qemu-system-x86_64" +export QEMU_IMG_PROG="$PWD/qemu-img" +export QEMU_IO_PROG="$PWD/qemu-io" if [ ! -x $QEMU_PROG ]; then echo "'make check-block' requires qemu-system-x86_64" diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 index ffd14e2ce9..42a57e4e86 100755 --- a/tests/qemu-iotests/001 +++ b/tests/qemu-iotests/001 @@ -24,7 +24,7 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index d4f8e91b91..70799f8a9a 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -24,7 +24,7 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index 19889b9fcd..d5396e54a5 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -24,7 +24,7 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 index 6f2aa3d9a2..9552cd31ea 100755 --- a/tests/qemu-iotests/004 +++ b/tests/qemu-iotests/004 @@ -24,7 +24,7 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index 444737751f..1cf3d67b74 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -27,7 +27,7 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index fa543eeb7d..e4ebcdea54 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 index 8e89d74fe9..62d9524045 100755 --- a/tests/qemu-iotests/008 +++ b/tests/qemu-iotests/008 @@ -24,7 +24,7 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index 16e4475ca4..fbcfe5cd17 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index 151dac238d..285e7bf960 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index f8d044ec85..4da1670083 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 index 01a770d59c..a35bbd58e1 100755 --- a/tests/qemu-iotests/012 +++ b/tests/qemu-iotests/012 @@ -26,7 +26,7 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 index d013f87da9..3a9668cad0 100755 --- a/tests/qemu-iotests/013 +++ b/tests/qemu-iotests/013 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 index 2ea79e8c8b..1404d14eff 100755 --- a/tests/qemu-iotests/014 +++ b/tests/qemu-iotests/014 @@ -26,7 +26,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index aaf9c3f415..fd43f80503 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 4f9302db42..a0de5ed878 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index 1d39d35c47..fab2fc1803 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index 24a789a25c..5697d109b6 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -26,7 +26,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index eac5080f83..7b066d19a3 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 index 11e8ed7187..e568f38c69 100755 --- a/tests/qemu-iotests/021 +++ b/tests/qemu-iotests/021 @@ -24,7 +24,7 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 index 2452a9f86a..a438a8862d 100755 --- a/tests/qemu-iotests/022 +++ b/tests/qemu-iotests/022 @@ -26,7 +26,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 index 497ae1ed17..23b16a4d9b 100755 --- a/tests/qemu-iotests/023 +++ b/tests/qemu-iotests/023 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index 4071ed6093..a91200cd59 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 index 70dd5f10aa..17f7d17673 100755 --- a/tests/qemu-iotests/025 +++ b/tests/qemu-iotests/025 @@ -24,7 +24,7 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 582d254195..84d3bd509f 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index 08593da775..33539cc769 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -24,7 +24,7 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 97a8869251..ad87aa0dae 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -27,7 +27,7 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index 5cff6875bf..fc430c78de 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index 1e08abc5ed..ab599add77 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index 24bcb52fc2..ce1dbaf086 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -26,7 +26,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index ee8a1338bb..9492f17e5f 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -24,7 +24,7 @@ owner=pbonzini@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 index 1b28bdae63..f4ebad8edb 100755 --- a/tests/qemu-iotests/034 +++ b/tests/qemu-iotests/034 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 index efc38e4d49..522e5e8245 100755 --- a/tests/qemu-iotests/035 +++ b/tests/qemu-iotests/035 @@ -25,7 +25,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index ce638d6076..ecb556ef26 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -27,7 +27,7 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index c476b823d2..95a7e7731b 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 index d99a1501d7..338123d5f2 100755 --- a/tests/qemu-iotests/038 +++ b/tests/qemu-iotests/038 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index 1f48339692..caf245def0 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -27,7 +27,7 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index a53e7cb757..e5ce618766 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index 1c6c22d92a..8bbb72695f 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -24,7 +24,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index f2ebecf24c..79de8064ec 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 index 1b8f3d4a64..07e391d7ea 100755 --- a/tests/qemu-iotests/047 +++ b/tests/qemu-iotests/047 @@ -25,7 +25,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index df35b6d21e..a456d097d4 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 index 03b4a5d620..294dffb88c 100755 --- a/tests/qemu-iotests/050 +++ b/tests/qemu-iotests/050 @@ -24,7 +24,7 @@ owner=pbonzini@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 25d3b2d478..69adc791df 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index 842eaced3b..aefff4bff5 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -24,7 +24,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 index 2a04f5f551..f04b88bbc1 100755 --- a/tests/qemu-iotests/053 +++ b/tests/qemu-iotests/053 @@ -24,7 +24,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 index bf47ef9fac..4e6361f0d9 100755 --- a/tests/qemu-iotests/054 +++ b/tests/qemu-iotests/054 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 5eb8784669..1ba0cbee25 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -26,7 +26,7 @@ owner=xiawenc@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! nbd_unix_socket=$TEST_DIR/test_qemu_nbd_socket diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 530bbbe6ce..2bfdb941f6 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -24,7 +24,7 @@ owner=famz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index 911b6f2894..92c1889333 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -24,7 +24,7 @@ owner=mreitz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 index 051fb9f410..6d1638711c 100755 --- a/tests/qemu-iotests/062 +++ b/tests/qemu-iotests/062 @@ -25,7 +25,7 @@ owner=mreitz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index adc037c1f5..6daf389a3d 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -25,7 +25,7 @@ owner=alex@alex.org.uk seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 index 5792fbbc92..22d5678e3d 100755 --- a/tests/qemu-iotests/064 +++ b/tests/qemu-iotests/064 @@ -24,7 +24,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index fe259f6165..62dc3e820d 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! # get standard environment, filters and checks diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 index 8d08d74ff9..6fbb95a086 100755 --- a/tests/qemu-iotests/070 +++ b/tests/qemu-iotests/070 @@ -25,7 +25,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index 40f85b18b9..c572d9afcc 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 index caa30d4743..df5f88a43c 100755 --- a/tests/qemu-iotests/075 +++ b/tests/qemu-iotests/075 @@ -24,7 +24,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index ef9e6a4ff3..35bce0b210 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 index b3c6fb1370..8e6a9a598f 100755 --- a/tests/qemu-iotests/077 +++ b/tests/qemu-iotests/077 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index a106c26f6b..86b0e95897 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index b2e3f7426a..da0e441d54 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -24,7 +24,7 @@ owner=hutao@cn.fujitsu.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index f0eb42f390..14f3d7f275 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index da3fb0984b..b30a7c4331 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -24,7 +24,7 @@ owner=benoit@irqsave.net seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index 3e605d52d1..e8008f2044 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index 3c1adbf0fb..a42a2e1819 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -24,7 +24,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 index 04f2aa9d7d..559c8ed1ea 100755 --- a/tests/qemu-iotests/084 +++ b/tests/qemu-iotests/084 @@ -25,7 +25,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 5c7668cf9b..0786b28503 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -29,7 +29,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! snapshot_virt0="snapshot-v0.qcow2" diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 index 84e3835071..442e63afc4 100755 --- a/tests/qemu-iotests/086 +++ b/tests/qemu-iotests/086 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index 2561a14456..4303e0e62b 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! # get standard environment, filters and checks diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 index b8076f216b..e55b67cd69 100755 --- a/tests/qemu-iotests/088 +++ b/tests/qemu-iotests/088 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index 10ac4a8d73..2e66ed31b9 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -26,7 +26,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! MIG_FIFO="${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 index 5bbdd071d8..be71add468 100755 --- a/tests/qemu-iotests/092 +++ b/tests/qemu-iotests/092 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index 72ecc22e1b..3ce960502c 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -27,7 +27,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 index ea53f8b8d3..6022eb31fc 100755 --- a/tests/qemu-iotests/101 +++ b/tests/qemu-iotests/101 @@ -24,7 +24,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 index 726d467052..b790c89528 100755 --- a/tests/qemu-iotests/104 +++ b/tests/qemu-iotests/104 @@ -24,7 +24,7 @@ owner=hutao@cn.fujitsu.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! trap "exit \$status" 0 1 2 3 15 diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index 3db4ce3cf3..3c125bf163 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -24,7 +24,7 @@ owner=famz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 index df0172fed3..bb75a33e78 100755 --- a/tests/qemu-iotests/116 +++ b/tests/qemu-iotests/116 @@ -27,7 +27,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index 0976a18133..5a6dde0c03 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -24,7 +24,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! devname="eiodev$$" diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index 94a9ae76af..47da00e3aa 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -24,7 +24,7 @@ owner=den@openvz.org seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 index af6b3e1dd4..9bca244c90 100755 --- a/tests/qemu-iotests/133 +++ b/tests/qemu-iotests/133 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index 99144151b8..934c6c534a 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -24,7 +24,7 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 index ce608312f6..b12246fee9 100755 --- a/tests/qemu-iotests/135 +++ b/tests/qemu-iotests/135 @@ -24,7 +24,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 1639c83985..0ac1402f55 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 index 4b915718cd..15909fe7bd 100755 --- a/tests/qemu-iotests/144 +++ b/tests/qemu-iotests/144 @@ -26,7 +26,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! TMP_SNAP1=${TEST_DIR}/tmp.qcow2 diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index c371b3c46a..f8f4849490 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 index 043711be68..c8e99a344a 100755 --- a/tests/qemu-iotests/146 +++ b/tests/qemu-iotests/146 @@ -24,7 +24,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 index fde03b0dc8..cb68dbee00 100755 --- a/tests/qemu-iotests/154 +++ b/tests/qemu-iotests/154 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 24ac600a4a..168f331197 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -24,7 +24,7 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 index bcfaaf1be2..910f18fd59 100755 --- a/tests/qemu-iotests/171 +++ b/tests/qemu-iotests/171 @@ -25,7 +25,7 @@ owner=tgolembi@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 02c5f79bab..203554b30a 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 index bdaa092979..f657becd80 100755 --- a/tests/qemu-iotests/173 +++ b/tests/qemu-iotests/173 @@ -24,7 +24,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 index 552879db32..bc8d6df3f6 100755 --- a/tests/qemu-iotests/174 +++ b/tests/qemu-iotests/174 @@ -24,7 +24,7 @@ owner=nirsof@gmail.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 index ca56e827cd..e3c904695d 100755 --- a/tests/qemu-iotests/175 +++ b/tests/qemu-iotests/175 @@ -24,7 +24,7 @@ owner=nirsof@gmail.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 index 396986da89..dfd5723c8b 100755 --- a/tests/qemu-iotests/177 +++ b/tests/qemu-iotests/177 @@ -24,7 +24,7 @@ owner=eblake@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 index 6af52c653a..5d25a50d03 100755 --- a/tests/qemu-iotests/178 +++ b/tests/qemu-iotests/178 @@ -24,7 +24,7 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index e02979378d..c05318096a 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! MIG_SOCKET="${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index c49e1ad6ef..b28701302b 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! MIG_SOCKET="${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 index 2b68284d58..a36a2e3270 100755 --- a/tests/qemu-iotests/184 +++ b/tests/qemu-iotests/184 @@ -24,7 +24,7 @@ owner="Manos Pitsidianakis" seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! trap "exit \$status" 0 1 2 3 15 diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 7dcfdeac60..80dca40465 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index 0aa4395a57..ab71a30c14 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 index 7bb783363c..6affdc253c 100755 --- a/tests/qemu-iotests/187 +++ b/tests/qemu-iotests/187 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index 83ed03e33e..d946b9699d 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -24,7 +24,7 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 index e695475722..e98001fd99 100755 --- a/tests/qemu-iotests/189 +++ b/tests/qemu-iotests/189 @@ -24,7 +24,7 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 index 8f808fef5d..fce04e2f3f 100755 --- a/tests/qemu-iotests/190 +++ b/tests/qemu-iotests/190 @@ -24,7 +24,7 @@ owner=eblake@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 index d6860e72f7..7de80df778 100755 --- a/tests/qemu-iotests/191 +++ b/tests/qemu-iotests/191 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 595f0d786a..ee8fd2d841 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -25,7 +25,7 @@ owner=famz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index e7a403ded2..7784b1f363 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -24,7 +24,7 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198 index 54eaaf5153..c23bd16ea7 100755 --- a/tests/qemu-iotests/198 +++ b/tests/qemu-iotests/198 @@ -24,7 +24,7 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index ddbdedc476..4f5d5b3b23 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -26,7 +26,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/204 b/tests/qemu-iotests/204 index feb69d2ada..0ec550a691 100755 --- a/tests/qemu-iotests/204 +++ b/tests/qemu-iotests/204 @@ -24,7 +24,7 @@ owner=eblake@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226 index 8ec3e612dd..c396edb6ab 100755 --- a/tests/qemu-iotests/226 +++ b/tests/qemu-iotests/226 @@ -25,7 +25,7 @@ owner=jsnow@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231 index 3e283708b4..e044cea9b5 100755 --- a/tests/qemu-iotests/231 +++ b/tests/qemu-iotests/231 @@ -26,7 +26,7 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` +here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index aa94c6c7ea..b37713277d 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -99,7 +99,7 @@ set_prog_path() } if [ -z "$TEST_DIR" ]; then - TEST_DIR=`pwd`/scratch + TEST_DIR=$PWD/scratch fi if [ ! -e "$TEST_DIR" ]; then diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index 102aa6878a..d4721ba92d 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -25,7 +25,7 @@ HOSTOS=`uname -s` arch=`uname -m` [[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch" -export PWD=`pwd` +export PWD=$PWD # make sure we have a standard umask umask 022 diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 44bee16a5e..5dc3f18ac2 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -160,7 +160,7 @@ fi ORIG_TEST_IMG="$TEST_IMG" if [ -z "$TEST_DIR" ]; then - TEST_DIR=`pwd`/scratch + TEST_DIR=$PWD/scratch fi QEMU_TEST_DIR="${TEST_DIR}" -- 2.17.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD Mao Zhongyi @ 2018-11-16 16:53 ` Eric Blake 2018-11-16 20:42 ` Eric Blake 2018-11-16 20:46 ` Eric Blake 1 sibling, 1 reply; 11+ messages in thread From: Eric Blake @ 2018-11-16 16:53 UTC (permalink / raw) To: Mao Zhongyi, qemu-devel; +Cc: kwolf, mreitz On 10/24/18 4:40 AM, Mao Zhongyi wrote: > POSIX requires $PWD to be reliable, and we expect all > shells used by qemu scripts to be relatively close to > POSIX. Thus, it is smarter to avoid forking the pwd > executable for something that is already available in > the environment. > > So replac it with the following: s/replac/replace/ > > sed -i 's/`pwd`/$PWD/g' $(git grep -l "\`pwd\`") > sed -i 's/$(pwd)/$PWD/g' $(git grep -l "\$(pwd)") > > The remaining small parts are manually modified. Reviewed-by: Eric Blake <eblake@redhat.com> > > Cc: kwolf@redhat.com > Cc: mreitz@redhat.com > Cc: eblake@redhat.com > > Suggested-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> > --- > configure | 2 +- > tests/check-block.sh | 6 +++--- > tests/qemu-iotests/001 | 2 +- However, this is a LOT of churn, since patch 2 then removes many of these lines. I'd like to swap the two patches, and then am considering them going through the NBD tree. > +++ b/tests/qemu-iotests/001 > @@ -24,7 +24,7 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=`pwd` > +here=$PWD > status=1 # failure is the default! > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD 2018-11-16 16:53 ` Eric Blake @ 2018-11-16 20:42 ` Eric Blake 0 siblings, 0 replies; 11+ messages in thread From: Eric Blake @ 2018-11-16 20:42 UTC (permalink / raw) To: Mao Zhongyi, qemu-devel; +Cc: kwolf, mreitz On 11/16/18 10:53 AM, Eric Blake wrote: > On 10/24/18 4:40 AM, Mao Zhongyi wrote: >> POSIX requires $PWD to be reliable, and we expect all >> shells used by qemu scripts to be relatively close to >> POSIX. Thus, it is smarter to avoid forking the pwd >> executable for something that is already available in >> the environment. >> >> So replac it with the following: > > s/replac/replace/ > >> >> sed -i 's/`pwd`/$PWD/g' $(git grep -l "\`pwd\`") >> sed -i 's/$(pwd)/$PWD/g' $(git grep -l "\$(pwd)") This didn't modify anything (the first $ was not escaped). >> >> The remaining small parts are manually modified. What remaining small parts? With a fixed sed line, I made all of the same edits as you, plus one you missed a comment in scripts/coccinelle/tcg_gen_extract.cocci that could also be updated. > > Reviewed-by: Eric Blake <eblake@redhat.com> Here's the updated command line I used: sed -i 's/\(`pwd`\|\$(pwd)\)/$PWD/g' $(git grep -l pwd) and reordering this to occur second makes it much easier to review (only 6 files outside of tests/qemu-iotests/??? that needed a change). -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD Mao Zhongyi 2018-11-16 16:53 ` Eric Blake @ 2018-11-16 20:46 ` Eric Blake 1 sibling, 0 replies; 11+ messages in thread From: Eric Blake @ 2018-11-16 20:46 UTC (permalink / raw) To: Mao Zhongyi, qemu-devel; +Cc: kwolf, mreitz On 10/24/18 4:40 AM, Mao Zhongyi wrote: > POSIX requires $PWD to be reliable, and we expect all > shells used by qemu scripts to be relatively close to > POSIX. Thus, it is smarter to avoid forking the pwd > executable for something that is already available in > the environment. > > So replac it with the following: > > sed -i 's/`pwd`/$PWD/g' $(git grep -l "\`pwd\`") > sed -i 's/$(pwd)/$PWD/g' $(git grep -l "\$(pwd)") > > The remaining small parts are manually modified. > > +++ b/tests/qemu-iotests/common.config > @@ -25,7 +25,7 @@ HOSTOS=`uname -s` > arch=`uname -m` > [[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch" > > -export PWD=`pwd` > +export PWD=$PWD This is now pointless. I'm deleting the line instead. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here 2018-10-24 9:40 [Qemu-devel] [PATCH v2 0/3] Do some cleaning work in qemu-iotests Mao Zhongyi 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD Mao Zhongyi @ 2018-10-24 9:40 ` Mao Zhongyi 2018-10-24 23:26 ` Philippe Mathieu-Daudé 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 3/3] qemu-iotests: Modern shell scripting (use $() instead of ``) Mao Zhongyi 2 siblings, 1 reply; 11+ messages in thread From: Mao Zhongyi @ 2018-10-24 9:40 UTC (permalink / raw) To: qemu-devel; +Cc: Mao Zhongyi, kwolf, mreitz, eblake run git grep '\$here' tests/qemu-iotests has 0 hits, which means we are setting a variable that no use, so execute the following cmd to remove all of the 'here=...' lines as dead code. sed -i '/here=/d' $(git grep -l 'here=' tests/qemu-iotests) Cc: kwolf@redhat.com Cc: mreitz@redhat.com Cc: eblake@redhat.com Suggested-by: Eric Blake <eblake@redhat.com> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> --- tests/qemu-iotests/001 | 1 - tests/qemu-iotests/002 | 1 - tests/qemu-iotests/003 | 1 - tests/qemu-iotests/004 | 1 - tests/qemu-iotests/005 | 1 - tests/qemu-iotests/007 | 1 - tests/qemu-iotests/008 | 1 - tests/qemu-iotests/009 | 1 - tests/qemu-iotests/010 | 1 - tests/qemu-iotests/011 | 1 - tests/qemu-iotests/012 | 1 - tests/qemu-iotests/013 | 1 - tests/qemu-iotests/014 | 1 - tests/qemu-iotests/015 | 1 - tests/qemu-iotests/017 | 1 - tests/qemu-iotests/018 | 1 - tests/qemu-iotests/019 | 1 - tests/qemu-iotests/020 | 1 - tests/qemu-iotests/021 | 1 - tests/qemu-iotests/022 | 1 - tests/qemu-iotests/023 | 1 - tests/qemu-iotests/024 | 1 - tests/qemu-iotests/025 | 1 - tests/qemu-iotests/026 | 1 - tests/qemu-iotests/027 | 1 - tests/qemu-iotests/028 | 1 - tests/qemu-iotests/029 | 1 - tests/qemu-iotests/031 | 1 - tests/qemu-iotests/032 | 1 - tests/qemu-iotests/033 | 1 - tests/qemu-iotests/034 | 1 - tests/qemu-iotests/035 | 1 - tests/qemu-iotests/036 | 1 - tests/qemu-iotests/037 | 1 - tests/qemu-iotests/038 | 1 - tests/qemu-iotests/039 | 1 - tests/qemu-iotests/042 | 1 - tests/qemu-iotests/043 | 1 - tests/qemu-iotests/046 | 1 - tests/qemu-iotests/047 | 1 - tests/qemu-iotests/049 | 1 - tests/qemu-iotests/050 | 1 - tests/qemu-iotests/051 | 1 - tests/qemu-iotests/052 | 1 - tests/qemu-iotests/053 | 1 - tests/qemu-iotests/054 | 1 - tests/qemu-iotests/058 | 1 - tests/qemu-iotests/059 | 1 - tests/qemu-iotests/060 | 1 - tests/qemu-iotests/061 | 1 - tests/qemu-iotests/062 | 1 - tests/qemu-iotests/063 | 1 - tests/qemu-iotests/064 | 1 - tests/qemu-iotests/066 | 1 - tests/qemu-iotests/067 | 1 - tests/qemu-iotests/068 | 1 - tests/qemu-iotests/069 | 1 - tests/qemu-iotests/070 | 1 - tests/qemu-iotests/071 | 1 - tests/qemu-iotests/072 | 1 - tests/qemu-iotests/073 | 1 - tests/qemu-iotests/075 | 1 - tests/qemu-iotests/076 | 1 - tests/qemu-iotests/077 | 1 - tests/qemu-iotests/078 | 1 - tests/qemu-iotests/079 | 1 - tests/qemu-iotests/080 | 1 - tests/qemu-iotests/081 | 1 - tests/qemu-iotests/082 | 1 - tests/qemu-iotests/083 | 1 - tests/qemu-iotests/084 | 1 - tests/qemu-iotests/085 | 1 - tests/qemu-iotests/086 | 1 - tests/qemu-iotests/087 | 1 - tests/qemu-iotests/088 | 1 - tests/qemu-iotests/089 | 1 - tests/qemu-iotests/090 | 1 - tests/qemu-iotests/091 | 1 - tests/qemu-iotests/092 | 1 - tests/qemu-iotests/094 | 1 - tests/qemu-iotests/095 | 1 - tests/qemu-iotests/097 | 1 - tests/qemu-iotests/098 | 1 - tests/qemu-iotests/099 | 1 - tests/qemu-iotests/101 | 1 - tests/qemu-iotests/102 | 1 - tests/qemu-iotests/103 | 1 - tests/qemu-iotests/104 | 1 - tests/qemu-iotests/105 | 1 - tests/qemu-iotests/106 | 1 - tests/qemu-iotests/107 | 1 - tests/qemu-iotests/108 | 1 - tests/qemu-iotests/109 | 1 - tests/qemu-iotests/110 | 1 - tests/qemu-iotests/111 | 1 - tests/qemu-iotests/112 | 1 - tests/qemu-iotests/113 | 1 - tests/qemu-iotests/114 | 1 - tests/qemu-iotests/115 | 1 - tests/qemu-iotests/116 | 1 - tests/qemu-iotests/117 | 1 - tests/qemu-iotests/119 | 1 - tests/qemu-iotests/120 | 1 - tests/qemu-iotests/121 | 1 - tests/qemu-iotests/122 | 1 - tests/qemu-iotests/123 | 1 - tests/qemu-iotests/125 | 1 - tests/qemu-iotests/126 | 1 - tests/qemu-iotests/127 | 1 - tests/qemu-iotests/128 | 1 - tests/qemu-iotests/130 | 1 - tests/qemu-iotests/131 | 1 - tests/qemu-iotests/133 | 1 - tests/qemu-iotests/134 | 1 - tests/qemu-iotests/135 | 1 - tests/qemu-iotests/137 | 1 - tests/qemu-iotests/138 | 1 - tests/qemu-iotests/140 | 1 - tests/qemu-iotests/141 | 1 - tests/qemu-iotests/142 | 1 - tests/qemu-iotests/143 | 1 - tests/qemu-iotests/144 | 1 - tests/qemu-iotests/145 | 1 - tests/qemu-iotests/146 | 1 - tests/qemu-iotests/150 | 1 - tests/qemu-iotests/153 | 1 - tests/qemu-iotests/154 | 1 - tests/qemu-iotests/156 | 1 - tests/qemu-iotests/157 | 1 - tests/qemu-iotests/158 | 1 - tests/qemu-iotests/159 | 1 - tests/qemu-iotests/160 | 1 - tests/qemu-iotests/162 | 1 - tests/qemu-iotests/170 | 1 - tests/qemu-iotests/171 | 1 - tests/qemu-iotests/172 | 1 - tests/qemu-iotests/173 | 1 - tests/qemu-iotests/174 | 1 - tests/qemu-iotests/175 | 1 - tests/qemu-iotests/176 | 1 - tests/qemu-iotests/177 | 1 - tests/qemu-iotests/178 | 1 - tests/qemu-iotests/179 | 1 - tests/qemu-iotests/181 | 1 - tests/qemu-iotests/182 | 1 - tests/qemu-iotests/183 | 1 - tests/qemu-iotests/184 | 1 - tests/qemu-iotests/185 | 1 - tests/qemu-iotests/186 | 1 - tests/qemu-iotests/187 | 1 - tests/qemu-iotests/188 | 1 - tests/qemu-iotests/189 | 1 - tests/qemu-iotests/190 | 1 - tests/qemu-iotests/191 | 1 - tests/qemu-iotests/192 | 1 - tests/qemu-iotests/195 | 1 - tests/qemu-iotests/197 | 1 - tests/qemu-iotests/198 | 1 - tests/qemu-iotests/200 | 1 - tests/qemu-iotests/204 | 1 - tests/qemu-iotests/214 | 1 - tests/qemu-iotests/215 | 1 - tests/qemu-iotests/221 | 1 - tests/qemu-iotests/223 | 1 - tests/qemu-iotests/225 | 1 - tests/qemu-iotests/226 | 1 - tests/qemu-iotests/227 | 1 - tests/qemu-iotests/229 | 1 - tests/qemu-iotests/231 | 1 - 169 files changed, 169 deletions(-) diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 index 42a57e4e86..55dcbb71d9 100755 --- a/tests/qemu-iotests/001 +++ b/tests/qemu-iotests/001 @@ -24,7 +24,6 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index 70799f8a9a..74572b4711 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -24,7 +24,6 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index d5396e54a5..bf2595559b 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -24,7 +24,6 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 index 9552cd31ea..841b15dfac 100755 --- a/tests/qemu-iotests/004 +++ b/tests/qemu-iotests/004 @@ -24,7 +24,6 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index 1cf3d67b74..8aa4283a4d 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -27,7 +27,6 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index e4ebcdea54..b983022a7f 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 index 62d9524045..8dfa10bcb8 100755 --- a/tests/qemu-iotests/008 +++ b/tests/qemu-iotests/008 @@ -24,7 +24,6 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index fbcfe5cd17..73ae09db69 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index 285e7bf960..751aca9813 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index 4da1670083..35909564a9 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 index a35bbd58e1..de9a5fb4d5 100755 --- a/tests/qemu-iotests/012 +++ b/tests/qemu-iotests/012 @@ -26,7 +26,6 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 index 3a9668cad0..5e1efcee28 100755 --- a/tests/qemu-iotests/013 +++ b/tests/qemu-iotests/013 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 index 1404d14eff..9ade571a95 100755 --- a/tests/qemu-iotests/014 +++ b/tests/qemu-iotests/014 @@ -26,7 +26,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index fd43f80503..21f7d42c84 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index a0de5ed878..1ac6f74502 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index fab2fc1803..bba30a1be2 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index 5697d109b6..8f911a79c1 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -26,7 +26,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 7b066d19a3..6b972d082f 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 index e568f38c69..c15ebf9eb8 100755 --- a/tests/qemu-iotests/021 +++ b/tests/qemu-iotests/021 @@ -24,7 +24,6 @@ owner=hch@lst.de seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 index a438a8862d..44765c7b7a 100755 --- a/tests/qemu-iotests/022 +++ b/tests/qemu-iotests/022 @@ -26,7 +26,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 index 23b16a4d9b..c8e1b9a761 100755 --- a/tests/qemu-iotests/023 +++ b/tests/qemu-iotests/023 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index a91200cd59..428b5c815d 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 index 17f7d17673..fcd4d97c17 100755 --- a/tests/qemu-iotests/025 +++ b/tests/qemu-iotests/025 @@ -24,7 +24,6 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 84d3bd509f..31276d9027 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index 33539cc769..2c46ae1457 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -24,7 +24,6 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index ad87aa0dae..a2a7c93bcd 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index fc430c78de..cf0fe0f6a6 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index ab599add77..ac0dfaed7d 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index ce1dbaf086..3e86bb0111 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -26,7 +26,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index 9492f17e5f..46b91388ef 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -24,7 +24,6 @@ owner=pbonzini@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 index f4ebad8edb..62812cd53c 100755 --- a/tests/qemu-iotests/034 +++ b/tests/qemu-iotests/034 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 index 522e5e8245..a5716caf32 100755 --- a/tests/qemu-iotests/035 +++ b/tests/qemu-iotests/035 @@ -25,7 +25,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index ecb556ef26..4e76602a93 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index 95a7e7731b..2e43b19ed0 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 index 338123d5f2..4e03976023 100755 --- a/tests/qemu-iotests/038 +++ b/tests/qemu-iotests/038 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index caf245def0..b3c344cb27 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index e5ce618766..beaa339000 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index 8bbb72695f..fc9005b28f 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -24,7 +24,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index 79de8064ec..01c0de62d8 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 index 07e391d7ea..c168373cf0 100755 --- a/tests/qemu-iotests/047 +++ b/tests/qemu-iotests/047 @@ -25,7 +25,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index a456d097d4..4d0ad5cd50 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 index 294dffb88c..963a0db97f 100755 --- a/tests/qemu-iotests/050 +++ b/tests/qemu-iotests/050 @@ -24,7 +24,6 @@ owner=pbonzini@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 69adc791df..a676da8273 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index aefff4bff5..b992adf4ff 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -24,7 +24,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 index f04b88bbc1..afa109c950 100755 --- a/tests/qemu-iotests/053 +++ b/tests/qemu-iotests/053 @@ -24,7 +24,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 index 4e6361f0d9..cf88a7c76e 100755 --- a/tests/qemu-iotests/054 +++ b/tests/qemu-iotests/054 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 1ba0cbee25..0d741a7cac 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -26,7 +26,6 @@ owner=xiawenc@linux.vnet.ibm.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! nbd_unix_socket=$TEST_DIR/test_qemu_nbd_socket diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 2bfdb941f6..54d5567acc 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -24,7 +24,6 @@ owner=famz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 74ad371885..af0588ae9a 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index 92c1889333..1a50163419 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 index 6d1638711c..985fbef41e 100755 --- a/tests/qemu-iotests/062 +++ b/tests/qemu-iotests/062 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index 6daf389a3d..041fb5c1ac 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -25,7 +25,6 @@ owner=alex@alex.org.uk seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 index 22d5678e3d..f55ff37ca7 100755 --- a/tests/qemu-iotests/064 +++ b/tests/qemu-iotests/064 @@ -24,7 +24,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index 8638217736..26c043711b 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index 62dc3e820d..f8d584f487 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! # get standard environment, filters and checks diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index e7fca6a494..f0583d52ae 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 index 96e55ef216..fdee121f43 100755 --- a/tests/qemu-iotests/069 +++ b/tests/qemu-iotests/069 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 index 6fbb95a086..78e0390f5f 100755 --- a/tests/qemu-iotests/070 +++ b/tests/qemu-iotests/070 @@ -25,7 +25,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 48b495513f..6448e9e75b 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 index aa027c7d29..08ef29f5b4 100755 --- a/tests/qemu-iotests/072 +++ b/tests/qemu-iotests/072 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index c572d9afcc..5e7f76cb7f 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 index df5f88a43c..45b8901ef0 100755 --- a/tests/qemu-iotests/075 +++ b/tests/qemu-iotests/075 @@ -24,7 +24,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index 35bce0b210..3b5ab3fd08 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 index 8e6a9a598f..a40f319d37 100755 --- a/tests/qemu-iotests/077 +++ b/tests/qemu-iotests/077 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index 86b0e95897..68d0ea8802 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index da0e441d54..fca2f77d37 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -24,7 +24,6 @@ owner=hutao@cn.fujitsu.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index 14f3d7f275..cec2376f59 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index b30a7c4331..c5d4616630 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -24,7 +24,6 @@ owner=benoit@irqsave.net seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index e8008f2044..14f6631071 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index a42a2e1819..982adecf02 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -24,7 +24,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 index 559c8ed1ea..e131fa9642 100755 --- a/tests/qemu-iotests/084 +++ b/tests/qemu-iotests/084 @@ -25,7 +25,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 0786b28503..2ef84077b8 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -29,7 +29,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! snapshot_virt0="snapshot-v0.qcow2" diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 index 442e63afc4..971de7dc35 100755 --- a/tests/qemu-iotests/086 +++ b/tests/qemu-iotests/086 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index 4303e0e62b..109cdf5ea4 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! # get standard environment, filters and checks diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 index e55b67cd69..c5e9ab42c7 100755 --- a/tests/qemu-iotests/088 +++ b/tests/qemu-iotests/088 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index aa1ba4a98e..3165d79e2a 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 index 7380503d57..1450993e15 100755 --- a/tests/qemu-iotests/090 +++ b/tests/qemu-iotests/090 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index 2e66ed31b9..2f2f98ee64 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -26,7 +26,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! MIG_FIFO="${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 index be71add468..8e318f10b9 100755 --- a/tests/qemu-iotests/092 +++ b/tests/qemu-iotests/092 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index 9aa01e3627..7adc9b9138 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index 3ce960502c..9fc47f6b87 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -27,7 +27,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 index e22670c8d0..7234b16053 100755 --- a/tests/qemu-iotests/097 +++ b/tests/qemu-iotests/097 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 index b002e969b3..c7977da99a 100755 --- a/tests/qemu-iotests/098 +++ b/tests/qemu-iotests/098 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 index caaf58eee5..4a6275d4bc 100755 --- a/tests/qemu-iotests/099 +++ b/tests/qemu-iotests/099 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 index 6022eb31fc..3001ba3c0a 100755 --- a/tests/qemu-iotests/101 +++ b/tests/qemu-iotests/101 @@ -24,7 +24,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 index 04b3f28445..29a6a940e2 100755 --- a/tests/qemu-iotests/102 +++ b/tests/qemu-iotests/102 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq=$(basename $0) echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index 2841318492..66f8167f02 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq=$(basename $0) echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 index b790c89528..34bb0d23ba 100755 --- a/tests/qemu-iotests/104 +++ b/tests/qemu-iotests/104 @@ -24,7 +24,6 @@ owner=hutao@cn.fujitsu.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! trap "exit \$status" 0 1 2 3 15 diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index 3c125bf163..943bda2f4f 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -24,7 +24,6 @@ owner=famz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 index 5e51f88a78..4129fee6bc 100755 --- a/tests/qemu-iotests/106 +++ b/tests/qemu-iotests/106 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq=$(basename $0) echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 index d7222dc1c9..5d70ad2007 100755 --- a/tests/qemu-iotests/107 +++ b/tests/qemu-iotests/107 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 index 2355d98c1d..58e8ad7636 100755 --- a/tests/qemu-iotests/108 +++ b/tests/qemu-iotests/108 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index acbd079136..90bdae459b 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index 9de7369f3a..b64b3b215a 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 index a1c152d0c1..e15e66ac5d 100755 --- a/tests/qemu-iotests/111 +++ b/tests/qemu-iotests/111 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index 28eb9aae93..fba2965322 100755 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 index 4e09810905..d8d78c46dc 100755 --- a/tests/qemu-iotests/113 +++ b/tests/qemu-iotests/113 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index 5b7dc5496c..e17fb514cb 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 index 665c2ead41..0581e03c26 100755 --- a/tests/qemu-iotests/115 +++ b/tests/qemu-iotests/115 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 index bb75a33e78..f8a27b9c02 100755 --- a/tests/qemu-iotests/116 +++ b/tests/qemu-iotests/116 @@ -27,7 +27,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 index 6c83461182..e533e230a3 100755 --- a/tests/qemu-iotests/117 +++ b/tests/qemu-iotests/117 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 index 4f34fb4343..32810d52c9 100755 --- a/tests/qemu-iotests/119 +++ b/tests/qemu-iotests/119 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index f40b97d099..76afdf449b 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 index 6d6f55a5dc..d2885c700f 100755 --- a/tests/qemu-iotests/121 +++ b/tests/qemu-iotests/121 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 index d8c8ad722d..eab3399dd6 100755 --- a/tests/qemu-iotests/122 +++ b/tests/qemu-iotests/122 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 index b18e3fca9a..168b985c8b 100755 --- a/tests/qemu-iotests/123 +++ b/tests/qemu-iotests/123 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 index c20c71570c..778c874933 100755 --- a/tests/qemu-iotests/125 +++ b/tests/qemu-iotests/125 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq=$(basename $0) echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 index a2d4d6c73d..91148383ad 100755 --- a/tests/qemu-iotests/126 +++ b/tests/qemu-iotests/126 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! # get standard environment, filters and checks diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index 9e0d7d3be8..c9139ed5e6 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq=$(basename $0) echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index 5a6dde0c03..925f5c7e98 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -24,7 +24,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! devname="eiodev$$" diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index 2c4b94da1b..f2f2706b28 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -26,7 +26,6 @@ owner=kwolf@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index 47da00e3aa..58c25f7abe 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -24,7 +24,6 @@ owner=den@openvz.org seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 index 9bca244c90..a9a47a3c36 100755 --- a/tests/qemu-iotests/133 +++ b/tests/qemu-iotests/133 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index 934c6c534a..cacabcd28b 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -24,7 +24,6 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 index b12246fee9..a18a0c7230 100755 --- a/tests/qemu-iotests/135 +++ b/tests/qemu-iotests/135 @@ -24,7 +24,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index 19e8597306..09cd4450ca 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 index 21650d8197..eccbcae3a6 100755 --- a/tests/qemu-iotests/138 +++ b/tests/qemu-iotests/138 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index a8fc95145c..d4623b5a5d 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -28,7 +28,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 index 4246d387a1..e2408c7988 100755 --- a/tests/qemu-iotests/141 +++ b/tests/qemu-iotests/141 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 0ac1402f55..c7c360d11b 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index 5ff1944507..d6302cc06d 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 index 15909fe7bd..118c099994 100755 --- a/tests/qemu-iotests/144 +++ b/tests/qemu-iotests/144 @@ -26,7 +26,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! TMP_SNAP1=${TEST_DIR}/tmp.qcow2 diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index f8f4849490..6ce8a46f92 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 index c8e99a344a..3f61351ffe 100755 --- a/tests/qemu-iotests/146 +++ b/tests/qemu-iotests/146 @@ -24,7 +24,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 index ee8f6375f6..955b877efa 100755 --- a/tests/qemu-iotests/150 +++ b/tests/qemu-iotests/150 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index 0daeb1b005..00092b84b9 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -24,7 +24,6 @@ owner=famz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" tmp=/tmp/$$ status=1 # failure is the default! diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 index cb68dbee00..4a4abf0589 100755 --- a/tests/qemu-iotests/154 +++ b/tests/qemu-iotests/154 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index 0a9a09802e..f97f96f666 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -32,7 +32,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 index 2bf02be465..c3231b787a 100755 --- a/tests/qemu-iotests/157 +++ b/tests/qemu-iotests/157 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 168f331197..d277ddcc94 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -24,7 +24,6 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 index 9b0e1ecc90..e74b2739de 100755 --- a/tests/qemu-iotests/159 +++ b/tests/qemu-iotests/159 @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 _cleanup() diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 index 5c910e5bfc..92fff45d10 100755 --- a/tests/qemu-iotests/160 +++ b/tests/qemu-iotests/160 @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 _cleanup() diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 index 477a806360..ef02d844a2 100755 --- a/tests/qemu-iotests/162 +++ b/tests/qemu-iotests/162 @@ -25,7 +25,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 index b79359fc4e..861eabf5cc 100755 --- a/tests/qemu-iotests/170 +++ b/tests/qemu-iotests/170 @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 _cleanup() diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 index 910f18fd59..5b46069fde 100755 --- a/tests/qemu-iotests/171 +++ b/tests/qemu-iotests/171 @@ -25,7 +25,6 @@ owner=tgolembi@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 203554b30a..c5ee33ee81 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 index f657becd80..1fe8c5d738 100755 --- a/tests/qemu-iotests/173 +++ b/tests/qemu-iotests/173 @@ -24,7 +24,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 index bc8d6df3f6..d8bb05c4e2 100755 --- a/tests/qemu-iotests/174 +++ b/tests/qemu-iotests/174 @@ -24,7 +24,6 @@ owner=nirsof@gmail.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 index e3c904695d..ebbeb6e74c 100755 --- a/tests/qemu-iotests/175 +++ b/tests/qemu-iotests/175 @@ -24,7 +24,6 @@ owner=nirsof@gmail.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 index 32baa116dd..c091d0bd1e 100755 --- a/tests/qemu-iotests/176 +++ b/tests/qemu-iotests/176 @@ -29,7 +29,6 @@ owner=mreitz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 index dfd5723c8b..7bf8e1daf3 100755 --- a/tests/qemu-iotests/177 +++ b/tests/qemu-iotests/177 @@ -24,7 +24,6 @@ owner=eblake@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 index 5d25a50d03..3f4b4a4564 100755 --- a/tests/qemu-iotests/178 +++ b/tests/qemu-iotests/178 @@ -24,7 +24,6 @@ owner=stefanha@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179 index 115944a753..3040631636 100755 --- a/tests/qemu-iotests/179 +++ b/tests/qemu-iotests/179 @@ -24,7 +24,6 @@ owner=eblake@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index c05318096a..0c44108dac 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! MIG_SOCKET="${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index 4b31592fb8..9e0944d49a 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -24,7 +24,6 @@ owner=famz@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" tmp=/tmp/$$ status=1 # failure is the default! diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index b28701302b..ebb5e304ac 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! MIG_SOCKET="${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 index a36a2e3270..2f3259d558 100755 --- a/tests/qemu-iotests/184 +++ b/tests/qemu-iotests/184 @@ -24,7 +24,6 @@ owner="Manos Pitsidianakis" seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! trap "exit \$status" 0 1 2 3 15 diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 80dca40465..d8f1505cd8 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index ab71a30c14..29681bf45c 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 index 6affdc253c..1feddca508 100755 --- a/tests/qemu-iotests/187 +++ b/tests/qemu-iotests/187 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index d946b9699d..af40e496ee 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -24,7 +24,6 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 index e98001fd99..222bec133b 100755 --- a/tests/qemu-iotests/189 +++ b/tests/qemu-iotests/189 @@ -24,7 +24,6 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 index fce04e2f3f..95ba06d8f4 100755 --- a/tests/qemu-iotests/190 +++ b/tests/qemu-iotests/190 @@ -24,7 +24,6 @@ owner=eblake@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 index 7de80df778..198272ea3b 100755 --- a/tests/qemu-iotests/191 +++ b/tests/qemu-iotests/191 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index ee8fd2d841..415c706db5 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -25,7 +25,6 @@ owner=famz@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index 7784b1f363..f56f255715 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 index 0369aa5cff..8170f5d4ab 100755 --- a/tests/qemu-iotests/197 +++ b/tests/qemu-iotests/197 @@ -24,7 +24,6 @@ owner=eblake@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! # get standard environment, filters and checks diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198 index c23bd16ea7..4d961f4f3a 100755 --- a/tests/qemu-iotests/198 +++ b/tests/qemu-iotests/198 @@ -24,7 +24,6 @@ owner=berrange@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index 4f5d5b3b23..b9ebd5a8c7 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -26,7 +26,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/204 b/tests/qemu-iotests/204 index 0ec550a691..57f3afe1d7 100755 --- a/tests/qemu-iotests/204 +++ b/tests/qemu-iotests/204 @@ -24,7 +24,6 @@ owner=eblake@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 index c46ca2a6dd..7a2d5391bb 100755 --- a/tests/qemu-iotests/214 +++ b/tests/qemu-iotests/214 @@ -22,7 +22,6 @@ seq=$(basename "$0") echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215 index 2e616ed659..230fd2551a 100755 --- a/tests/qemu-iotests/215 +++ b/tests/qemu-iotests/215 @@ -21,7 +21,6 @@ seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! # get standard environment, filters and checks diff --git a/tests/qemu-iotests/221 b/tests/qemu-iotests/221 index 41c4e4bdf8..06f48f1f23 100755 --- a/tests/qemu-iotests/221 +++ b/tests/qemu-iotests/221 @@ -21,7 +21,6 @@ seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223 index 8b1859c2dd..58a3f3ff40 100755 --- a/tests/qemu-iotests/223 +++ b/tests/qemu-iotests/223 @@ -21,7 +21,6 @@ seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225 index f2ee715685..e42ee94ff0 100755 --- a/tests/qemu-iotests/225 +++ b/tests/qemu-iotests/225 @@ -24,7 +24,6 @@ owner=mreitz@redhat.com seq=$(basename $0) echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226 index c396edb6ab..aec413b23c 100755 --- a/tests/qemu-iotests/226 +++ b/tests/qemu-iotests/226 @@ -25,7 +25,6 @@ owner=jsnow@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227 index 9a5f7f9f14..43f2323ff2 100755 --- a/tests/qemu-iotests/227 +++ b/tests/qemu-iotests/227 @@ -24,7 +24,6 @@ owner=kwolf@redhat.com seq=$(basename $0) echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229 index ff851ec431..86602437ff 100755 --- a/tests/qemu-iotests/229 +++ b/tests/qemu-iotests/229 @@ -25,7 +25,6 @@ owner=jcody@redhat.com seq="$(basename $0)" echo "QA output created by $seq" -here="$PWD" status=1 # failure is the default! _cleanup() diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231 index e044cea9b5..e9f8aaacd3 100755 --- a/tests/qemu-iotests/231 +++ b/tests/qemu-iotests/231 @@ -26,7 +26,6 @@ owner=jcody@redhat.com seq=`basename $0` echo "QA output created by $seq" -here=$PWD status=1 # failure is the default! _cleanup() -- 2.17.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here Mao Zhongyi @ 2018-10-24 23:26 ` Philippe Mathieu-Daudé 2018-10-25 9:34 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variablehere maozy 2018-11-16 16:49 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here Eric Blake 0 siblings, 2 replies; 11+ messages in thread From: Philippe Mathieu-Daudé @ 2018-10-24 23:26 UTC (permalink / raw) To: Mao Zhongyi, qemu-devel, mreitz, Eric Blake; +Cc: kwolf Hi Mao, On 24/10/18 11:40, Mao Zhongyi wrote: > run > git grep '\$here' tests/qemu-iotests This command doesn't look correct, I believe you have to use either - git grep '$here' or - git grep \$here > > has 0 hits, which means we are setting a variable that > no use, so execute the following cmd to remove all of > the 'here=...' lines as dead code. This seems to have been removed in e8f8624d3b920de. > > sed -i '/here=/d' $(git grep -l 'here=' tests/qemu-iotests) > > Cc: kwolf@redhat.com > Cc: mreitz@redhat.com > Cc: eblake@redhat.com > > Suggested-by: Eric Blake <eblake@redhat.com> Please Cc Eric if he suggested, so he can review. > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> > --- > tests/qemu-iotests/001 | 1 - > tests/qemu-iotests/002 | 1 - > tests/qemu-iotests/003 | 1 - > tests/qemu-iotests/004 | 1 - > tests/qemu-iotests/005 | 1 - > tests/qemu-iotests/007 | 1 - > tests/qemu-iotests/008 | 1 - > tests/qemu-iotests/009 | 1 - > tests/qemu-iotests/010 | 1 - > tests/qemu-iotests/011 | 1 - > tests/qemu-iotests/012 | 1 - > tests/qemu-iotests/013 | 1 - > tests/qemu-iotests/014 | 1 - > tests/qemu-iotests/015 | 1 - > tests/qemu-iotests/017 | 1 - > tests/qemu-iotests/018 | 1 - > tests/qemu-iotests/019 | 1 - > tests/qemu-iotests/020 | 1 - > tests/qemu-iotests/021 | 1 - > tests/qemu-iotests/022 | 1 - > tests/qemu-iotests/023 | 1 - > tests/qemu-iotests/024 | 1 - > tests/qemu-iotests/025 | 1 - > tests/qemu-iotests/026 | 1 - > tests/qemu-iotests/027 | 1 - > tests/qemu-iotests/028 | 1 - > tests/qemu-iotests/029 | 1 - > tests/qemu-iotests/031 | 1 - > tests/qemu-iotests/032 | 1 - > tests/qemu-iotests/033 | 1 - > tests/qemu-iotests/034 | 1 - > tests/qemu-iotests/035 | 1 - > tests/qemu-iotests/036 | 1 - > tests/qemu-iotests/037 | 1 - > tests/qemu-iotests/038 | 1 - > tests/qemu-iotests/039 | 1 - > tests/qemu-iotests/042 | 1 - > tests/qemu-iotests/043 | 1 - > tests/qemu-iotests/046 | 1 - > tests/qemu-iotests/047 | 1 - > tests/qemu-iotests/049 | 1 - > tests/qemu-iotests/050 | 1 - > tests/qemu-iotests/051 | 1 - > tests/qemu-iotests/052 | 1 - > tests/qemu-iotests/053 | 1 - > tests/qemu-iotests/054 | 1 - > tests/qemu-iotests/058 | 1 - > tests/qemu-iotests/059 | 1 - > tests/qemu-iotests/060 | 1 - > tests/qemu-iotests/061 | 1 - > tests/qemu-iotests/062 | 1 - > tests/qemu-iotests/063 | 1 - > tests/qemu-iotests/064 | 1 - > tests/qemu-iotests/066 | 1 - > tests/qemu-iotests/067 | 1 - > tests/qemu-iotests/068 | 1 - > tests/qemu-iotests/069 | 1 - > tests/qemu-iotests/070 | 1 - > tests/qemu-iotests/071 | 1 - > tests/qemu-iotests/072 | 1 - > tests/qemu-iotests/073 | 1 - > tests/qemu-iotests/075 | 1 - > tests/qemu-iotests/076 | 1 - > tests/qemu-iotests/077 | 1 - > tests/qemu-iotests/078 | 1 - > tests/qemu-iotests/079 | 1 - > tests/qemu-iotests/080 | 1 - > tests/qemu-iotests/081 | 1 - > tests/qemu-iotests/082 | 1 - > tests/qemu-iotests/083 | 1 - > tests/qemu-iotests/084 | 1 - > tests/qemu-iotests/085 | 1 - > tests/qemu-iotests/086 | 1 - > tests/qemu-iotests/087 | 1 - > tests/qemu-iotests/088 | 1 - > tests/qemu-iotests/089 | 1 - > tests/qemu-iotests/090 | 1 - > tests/qemu-iotests/091 | 1 - > tests/qemu-iotests/092 | 1 - > tests/qemu-iotests/094 | 1 - > tests/qemu-iotests/095 | 1 - > tests/qemu-iotests/097 | 1 - > tests/qemu-iotests/098 | 1 - > tests/qemu-iotests/099 | 1 - > tests/qemu-iotests/101 | 1 - > tests/qemu-iotests/102 | 1 - > tests/qemu-iotests/103 | 1 - > tests/qemu-iotests/104 | 1 - > tests/qemu-iotests/105 | 1 - > tests/qemu-iotests/106 | 1 - > tests/qemu-iotests/107 | 1 - > tests/qemu-iotests/108 | 1 - > tests/qemu-iotests/109 | 1 - > tests/qemu-iotests/110 | 1 - > tests/qemu-iotests/111 | 1 - > tests/qemu-iotests/112 | 1 - > tests/qemu-iotests/113 | 1 - > tests/qemu-iotests/114 | 1 - > tests/qemu-iotests/115 | 1 - > tests/qemu-iotests/116 | 1 - > tests/qemu-iotests/117 | 1 - > tests/qemu-iotests/119 | 1 - > tests/qemu-iotests/120 | 1 - > tests/qemu-iotests/121 | 1 - > tests/qemu-iotests/122 | 1 - > tests/qemu-iotests/123 | 1 - > tests/qemu-iotests/125 | 1 - > tests/qemu-iotests/126 | 1 - > tests/qemu-iotests/127 | 1 - > tests/qemu-iotests/128 | 1 - > tests/qemu-iotests/130 | 1 - > tests/qemu-iotests/131 | 1 - > tests/qemu-iotests/133 | 1 - > tests/qemu-iotests/134 | 1 - > tests/qemu-iotests/135 | 1 - > tests/qemu-iotests/137 | 1 - > tests/qemu-iotests/138 | 1 - > tests/qemu-iotests/140 | 1 - > tests/qemu-iotests/141 | 1 - > tests/qemu-iotests/142 | 1 - > tests/qemu-iotests/143 | 1 - > tests/qemu-iotests/144 | 1 - > tests/qemu-iotests/145 | 1 - > tests/qemu-iotests/146 | 1 - > tests/qemu-iotests/150 | 1 - > tests/qemu-iotests/153 | 1 - > tests/qemu-iotests/154 | 1 - > tests/qemu-iotests/156 | 1 - > tests/qemu-iotests/157 | 1 - > tests/qemu-iotests/158 | 1 - > tests/qemu-iotests/159 | 1 - > tests/qemu-iotests/160 | 1 - > tests/qemu-iotests/162 | 1 - > tests/qemu-iotests/170 | 1 - > tests/qemu-iotests/171 | 1 - > tests/qemu-iotests/172 | 1 - > tests/qemu-iotests/173 | 1 - > tests/qemu-iotests/174 | 1 - > tests/qemu-iotests/175 | 1 - > tests/qemu-iotests/176 | 1 - > tests/qemu-iotests/177 | 1 - > tests/qemu-iotests/178 | 1 - > tests/qemu-iotests/179 | 1 - > tests/qemu-iotests/181 | 1 - > tests/qemu-iotests/182 | 1 - > tests/qemu-iotests/183 | 1 - > tests/qemu-iotests/184 | 1 - > tests/qemu-iotests/185 | 1 - > tests/qemu-iotests/186 | 1 - > tests/qemu-iotests/187 | 1 - > tests/qemu-iotests/188 | 1 - > tests/qemu-iotests/189 | 1 - > tests/qemu-iotests/190 | 1 - > tests/qemu-iotests/191 | 1 - > tests/qemu-iotests/192 | 1 - > tests/qemu-iotests/195 | 1 - > tests/qemu-iotests/197 | 1 - > tests/qemu-iotests/198 | 1 - > tests/qemu-iotests/200 | 1 - > tests/qemu-iotests/204 | 1 - > tests/qemu-iotests/214 | 1 - > tests/qemu-iotests/215 | 1 - > tests/qemu-iotests/221 | 1 - > tests/qemu-iotests/223 | 1 - > tests/qemu-iotests/225 | 1 - > tests/qemu-iotests/226 | 1 - > tests/qemu-iotests/227 | 1 - > tests/qemu-iotests/229 | 1 - > tests/qemu-iotests/231 | 1 - > 169 files changed, 169 deletions(-) > > diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 > index 42a57e4e86..55dcbb71d9 100755 > --- a/tests/qemu-iotests/001 > +++ b/tests/qemu-iotests/001 > @@ -24,7 +24,6 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 > index 70799f8a9a..74572b4711 100755 > --- a/tests/qemu-iotests/002 > +++ b/tests/qemu-iotests/002 > @@ -24,7 +24,6 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 > index d5396e54a5..bf2595559b 100755 > --- a/tests/qemu-iotests/003 > +++ b/tests/qemu-iotests/003 > @@ -24,7 +24,6 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 > index 9552cd31ea..841b15dfac 100755 > --- a/tests/qemu-iotests/004 > +++ b/tests/qemu-iotests/004 > @@ -24,7 +24,6 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 > index 1cf3d67b74..8aa4283a4d 100755 > --- a/tests/qemu-iotests/005 > +++ b/tests/qemu-iotests/005 > @@ -27,7 +27,6 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 > index e4ebcdea54..b983022a7f 100755 > --- a/tests/qemu-iotests/007 > +++ b/tests/qemu-iotests/007 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 > index 62d9524045..8dfa10bcb8 100755 > --- a/tests/qemu-iotests/008 > +++ b/tests/qemu-iotests/008 > @@ -24,7 +24,6 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 > index fbcfe5cd17..73ae09db69 100755 > --- a/tests/qemu-iotests/009 > +++ b/tests/qemu-iotests/009 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 > index 285e7bf960..751aca9813 100755 > --- a/tests/qemu-iotests/010 > +++ b/tests/qemu-iotests/010 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 > index 4da1670083..35909564a9 100755 > --- a/tests/qemu-iotests/011 > +++ b/tests/qemu-iotests/011 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 > index a35bbd58e1..de9a5fb4d5 100755 > --- a/tests/qemu-iotests/012 > +++ b/tests/qemu-iotests/012 > @@ -26,7 +26,6 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 > index 3a9668cad0..5e1efcee28 100755 > --- a/tests/qemu-iotests/013 > +++ b/tests/qemu-iotests/013 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 > index 1404d14eff..9ade571a95 100755 > --- a/tests/qemu-iotests/014 > +++ b/tests/qemu-iotests/014 > @@ -26,7 +26,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 > index fd43f80503..21f7d42c84 100755 > --- a/tests/qemu-iotests/015 > +++ b/tests/qemu-iotests/015 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 > index a0de5ed878..1ac6f74502 100755 > --- a/tests/qemu-iotests/017 > +++ b/tests/qemu-iotests/017 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 > index fab2fc1803..bba30a1be2 100755 > --- a/tests/qemu-iotests/018 > +++ b/tests/qemu-iotests/018 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 > index 5697d109b6..8f911a79c1 100755 > --- a/tests/qemu-iotests/019 > +++ b/tests/qemu-iotests/019 > @@ -26,7 +26,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 > index 7b066d19a3..6b972d082f 100755 > --- a/tests/qemu-iotests/020 > +++ b/tests/qemu-iotests/020 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 > index e568f38c69..c15ebf9eb8 100755 > --- a/tests/qemu-iotests/021 > +++ b/tests/qemu-iotests/021 > @@ -24,7 +24,6 @@ owner=hch@lst.de > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 > index a438a8862d..44765c7b7a 100755 > --- a/tests/qemu-iotests/022 > +++ b/tests/qemu-iotests/022 > @@ -26,7 +26,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 > index 23b16a4d9b..c8e1b9a761 100755 > --- a/tests/qemu-iotests/023 > +++ b/tests/qemu-iotests/023 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 > index a91200cd59..428b5c815d 100755 > --- a/tests/qemu-iotests/024 > +++ b/tests/qemu-iotests/024 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 > index 17f7d17673..fcd4d97c17 100755 > --- a/tests/qemu-iotests/025 > +++ b/tests/qemu-iotests/025 > @@ -24,7 +24,6 @@ owner=stefanha@linux.vnet.ibm.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 > index 84d3bd509f..31276d9027 100755 > --- a/tests/qemu-iotests/026 > +++ b/tests/qemu-iotests/026 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 > index 33539cc769..2c46ae1457 100755 > --- a/tests/qemu-iotests/027 > +++ b/tests/qemu-iotests/027 > @@ -24,7 +24,6 @@ owner=stefanha@linux.vnet.ibm.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 > index ad87aa0dae..a2a7c93bcd 100755 > --- a/tests/qemu-iotests/028 > +++ b/tests/qemu-iotests/028 > @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 > index fc430c78de..cf0fe0f6a6 100755 > --- a/tests/qemu-iotests/029 > +++ b/tests/qemu-iotests/029 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 > index ab599add77..ac0dfaed7d 100755 > --- a/tests/qemu-iotests/031 > +++ b/tests/qemu-iotests/031 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 > index ce1dbaf086..3e86bb0111 100755 > --- a/tests/qemu-iotests/032 > +++ b/tests/qemu-iotests/032 > @@ -26,7 +26,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 > index 9492f17e5f..46b91388ef 100755 > --- a/tests/qemu-iotests/033 > +++ b/tests/qemu-iotests/033 > @@ -24,7 +24,6 @@ owner=pbonzini@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 > index f4ebad8edb..62812cd53c 100755 > --- a/tests/qemu-iotests/034 > +++ b/tests/qemu-iotests/034 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 > index 522e5e8245..a5716caf32 100755 > --- a/tests/qemu-iotests/035 > +++ b/tests/qemu-iotests/035 > @@ -25,7 +25,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 > index ecb556ef26..4e76602a93 100755 > --- a/tests/qemu-iotests/036 > +++ b/tests/qemu-iotests/036 > @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 > index 95a7e7731b..2e43b19ed0 100755 > --- a/tests/qemu-iotests/037 > +++ b/tests/qemu-iotests/037 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 > index 338123d5f2..4e03976023 100755 > --- a/tests/qemu-iotests/038 > +++ b/tests/qemu-iotests/038 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 > index caf245def0..b3c344cb27 100755 > --- a/tests/qemu-iotests/039 > +++ b/tests/qemu-iotests/039 > @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 > index e5ce618766..beaa339000 100755 > --- a/tests/qemu-iotests/042 > +++ b/tests/qemu-iotests/042 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 > index 8bbb72695f..fc9005b28f 100755 > --- a/tests/qemu-iotests/043 > +++ b/tests/qemu-iotests/043 > @@ -24,7 +24,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 > index 79de8064ec..01c0de62d8 100755 > --- a/tests/qemu-iotests/046 > +++ b/tests/qemu-iotests/046 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 > index 07e391d7ea..c168373cf0 100755 > --- a/tests/qemu-iotests/047 > +++ b/tests/qemu-iotests/047 > @@ -25,7 +25,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 > index a456d097d4..4d0ad5cd50 100755 > --- a/tests/qemu-iotests/049 > +++ b/tests/qemu-iotests/049 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 > index 294dffb88c..963a0db97f 100755 > --- a/tests/qemu-iotests/050 > +++ b/tests/qemu-iotests/050 > @@ -24,7 +24,6 @@ owner=pbonzini@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 > index 69adc791df..a676da8273 100755 > --- a/tests/qemu-iotests/051 > +++ b/tests/qemu-iotests/051 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 > index aefff4bff5..b992adf4ff 100755 > --- a/tests/qemu-iotests/052 > +++ b/tests/qemu-iotests/052 > @@ -24,7 +24,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 > index f04b88bbc1..afa109c950 100755 > --- a/tests/qemu-iotests/053 > +++ b/tests/qemu-iotests/053 > @@ -24,7 +24,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 > index 4e6361f0d9..cf88a7c76e 100755 > --- a/tests/qemu-iotests/054 > +++ b/tests/qemu-iotests/054 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 > index 1ba0cbee25..0d741a7cac 100755 > --- a/tests/qemu-iotests/058 > +++ b/tests/qemu-iotests/058 > @@ -26,7 +26,6 @@ owner=xiawenc@linux.vnet.ibm.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > nbd_unix_socket=$TEST_DIR/test_qemu_nbd_socket > diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 > index 2bfdb941f6..54d5567acc 100755 > --- a/tests/qemu-iotests/059 > +++ b/tests/qemu-iotests/059 > @@ -24,7 +24,6 @@ owner=famz@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 > index 74ad371885..af0588ae9a 100755 > --- a/tests/qemu-iotests/060 > +++ b/tests/qemu-iotests/060 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 > index 92c1889333..1a50163419 100755 > --- a/tests/qemu-iotests/061 > +++ b/tests/qemu-iotests/061 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 > index 6d1638711c..985fbef41e 100755 > --- a/tests/qemu-iotests/062 > +++ b/tests/qemu-iotests/062 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 > index 6daf389a3d..041fb5c1ac 100755 > --- a/tests/qemu-iotests/063 > +++ b/tests/qemu-iotests/063 > @@ -25,7 +25,6 @@ owner=alex@alex.org.uk > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 > index 22d5678e3d..f55ff37ca7 100755 > --- a/tests/qemu-iotests/064 > +++ b/tests/qemu-iotests/064 > @@ -24,7 +24,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 > index 8638217736..26c043711b 100755 > --- a/tests/qemu-iotests/066 > +++ b/tests/qemu-iotests/066 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 > index 62dc3e820d..f8d584f487 100755 > --- a/tests/qemu-iotests/067 > +++ b/tests/qemu-iotests/067 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > # get standard environment, filters and checks > diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 > index e7fca6a494..f0583d52ae 100755 > --- a/tests/qemu-iotests/068 > +++ b/tests/qemu-iotests/068 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 > index 96e55ef216..fdee121f43 100755 > --- a/tests/qemu-iotests/069 > +++ b/tests/qemu-iotests/069 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 > index 6fbb95a086..78e0390f5f 100755 > --- a/tests/qemu-iotests/070 > +++ b/tests/qemu-iotests/070 > @@ -25,7 +25,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 > index 48b495513f..6448e9e75b 100755 > --- a/tests/qemu-iotests/071 > +++ b/tests/qemu-iotests/071 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 > index aa027c7d29..08ef29f5b4 100755 > --- a/tests/qemu-iotests/072 > +++ b/tests/qemu-iotests/072 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 > index c572d9afcc..5e7f76cb7f 100755 > --- a/tests/qemu-iotests/073 > +++ b/tests/qemu-iotests/073 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 > index df5f88a43c..45b8901ef0 100755 > --- a/tests/qemu-iotests/075 > +++ b/tests/qemu-iotests/075 > @@ -24,7 +24,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 > index 35bce0b210..3b5ab3fd08 100755 > --- a/tests/qemu-iotests/076 > +++ b/tests/qemu-iotests/076 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 > index 8e6a9a598f..a40f319d37 100755 > --- a/tests/qemu-iotests/077 > +++ b/tests/qemu-iotests/077 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 > index 86b0e95897..68d0ea8802 100755 > --- a/tests/qemu-iotests/078 > +++ b/tests/qemu-iotests/078 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 > index da0e441d54..fca2f77d37 100755 > --- a/tests/qemu-iotests/079 > +++ b/tests/qemu-iotests/079 > @@ -24,7 +24,6 @@ owner=hutao@cn.fujitsu.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 > index 14f3d7f275..cec2376f59 100755 > --- a/tests/qemu-iotests/080 > +++ b/tests/qemu-iotests/080 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 > index b30a7c4331..c5d4616630 100755 > --- a/tests/qemu-iotests/081 > +++ b/tests/qemu-iotests/081 > @@ -24,7 +24,6 @@ owner=benoit@irqsave.net > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 > index e8008f2044..14f6631071 100755 > --- a/tests/qemu-iotests/082 > +++ b/tests/qemu-iotests/082 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 > index a42a2e1819..982adecf02 100755 > --- a/tests/qemu-iotests/083 > +++ b/tests/qemu-iotests/083 > @@ -24,7 +24,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 > index 559c8ed1ea..e131fa9642 100755 > --- a/tests/qemu-iotests/084 > +++ b/tests/qemu-iotests/084 > @@ -25,7 +25,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 > index 0786b28503..2ef84077b8 100755 > --- a/tests/qemu-iotests/085 > +++ b/tests/qemu-iotests/085 > @@ -29,7 +29,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > snapshot_virt0="snapshot-v0.qcow2" > diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 > index 442e63afc4..971de7dc35 100755 > --- a/tests/qemu-iotests/086 > +++ b/tests/qemu-iotests/086 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 > index 4303e0e62b..109cdf5ea4 100755 > --- a/tests/qemu-iotests/087 > +++ b/tests/qemu-iotests/087 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > # get standard environment, filters and checks > diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 > index e55b67cd69..c5e9ab42c7 100755 > --- a/tests/qemu-iotests/088 > +++ b/tests/qemu-iotests/088 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 > index aa1ba4a98e..3165d79e2a 100755 > --- a/tests/qemu-iotests/089 > +++ b/tests/qemu-iotests/089 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 > index 7380503d57..1450993e15 100755 > --- a/tests/qemu-iotests/090 > +++ b/tests/qemu-iotests/090 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 > index 2e66ed31b9..2f2f98ee64 100755 > --- a/tests/qemu-iotests/091 > +++ b/tests/qemu-iotests/091 > @@ -26,7 +26,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > MIG_FIFO="${TEST_DIR}/migrate" > diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 > index be71add468..8e318f10b9 100755 > --- a/tests/qemu-iotests/092 > +++ b/tests/qemu-iotests/092 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 > index 9aa01e3627..7adc9b9138 100755 > --- a/tests/qemu-iotests/094 > +++ b/tests/qemu-iotests/094 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 > index 3ce960502c..9fc47f6b87 100755 > --- a/tests/qemu-iotests/095 > +++ b/tests/qemu-iotests/095 > @@ -27,7 +27,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 > index e22670c8d0..7234b16053 100755 > --- a/tests/qemu-iotests/097 > +++ b/tests/qemu-iotests/097 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 > index b002e969b3..c7977da99a 100755 > --- a/tests/qemu-iotests/098 > +++ b/tests/qemu-iotests/098 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 > index caaf58eee5..4a6275d4bc 100755 > --- a/tests/qemu-iotests/099 > +++ b/tests/qemu-iotests/099 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 > index 6022eb31fc..3001ba3c0a 100755 > --- a/tests/qemu-iotests/101 > +++ b/tests/qemu-iotests/101 > @@ -24,7 +24,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 > index 04b3f28445..29a6a940e2 100755 > --- a/tests/qemu-iotests/102 > +++ b/tests/qemu-iotests/102 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq=$(basename $0) > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 > index 2841318492..66f8167f02 100755 > --- a/tests/qemu-iotests/103 > +++ b/tests/qemu-iotests/103 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq=$(basename $0) > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 > index b790c89528..34bb0d23ba 100755 > --- a/tests/qemu-iotests/104 > +++ b/tests/qemu-iotests/104 > @@ -24,7 +24,6 @@ owner=hutao@cn.fujitsu.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > trap "exit \$status" 0 1 2 3 15 > diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 > index 3c125bf163..943bda2f4f 100755 > --- a/tests/qemu-iotests/105 > +++ b/tests/qemu-iotests/105 > @@ -24,7 +24,6 @@ owner=famz@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 > index 5e51f88a78..4129fee6bc 100755 > --- a/tests/qemu-iotests/106 > +++ b/tests/qemu-iotests/106 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq=$(basename $0) > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 > index d7222dc1c9..5d70ad2007 100755 > --- a/tests/qemu-iotests/107 > +++ b/tests/qemu-iotests/107 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 > index 2355d98c1d..58e8ad7636 100755 > --- a/tests/qemu-iotests/108 > +++ b/tests/qemu-iotests/108 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 > index acbd079136..90bdae459b 100755 > --- a/tests/qemu-iotests/109 > +++ b/tests/qemu-iotests/109 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 > index 9de7369f3a..b64b3b215a 100755 > --- a/tests/qemu-iotests/110 > +++ b/tests/qemu-iotests/110 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 > index a1c152d0c1..e15e66ac5d 100755 > --- a/tests/qemu-iotests/111 > +++ b/tests/qemu-iotests/111 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 > index 28eb9aae93..fba2965322 100755 > --- a/tests/qemu-iotests/112 > +++ b/tests/qemu-iotests/112 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 > index 4e09810905..d8d78c46dc 100755 > --- a/tests/qemu-iotests/113 > +++ b/tests/qemu-iotests/113 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 > index 5b7dc5496c..e17fb514cb 100755 > --- a/tests/qemu-iotests/114 > +++ b/tests/qemu-iotests/114 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 > index 665c2ead41..0581e03c26 100755 > --- a/tests/qemu-iotests/115 > +++ b/tests/qemu-iotests/115 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 > index bb75a33e78..f8a27b9c02 100755 > --- a/tests/qemu-iotests/116 > +++ b/tests/qemu-iotests/116 > @@ -27,7 +27,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 > index 6c83461182..e533e230a3 100755 > --- a/tests/qemu-iotests/117 > +++ b/tests/qemu-iotests/117 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 > index 4f34fb4343..32810d52c9 100755 > --- a/tests/qemu-iotests/119 > +++ b/tests/qemu-iotests/119 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 > index f40b97d099..76afdf449b 100755 > --- a/tests/qemu-iotests/120 > +++ b/tests/qemu-iotests/120 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 > index 6d6f55a5dc..d2885c700f 100755 > --- a/tests/qemu-iotests/121 > +++ b/tests/qemu-iotests/121 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 > index d8c8ad722d..eab3399dd6 100755 > --- a/tests/qemu-iotests/122 > +++ b/tests/qemu-iotests/122 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 > index b18e3fca9a..168b985c8b 100755 > --- a/tests/qemu-iotests/123 > +++ b/tests/qemu-iotests/123 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 > index c20c71570c..778c874933 100755 > --- a/tests/qemu-iotests/125 > +++ b/tests/qemu-iotests/125 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq=$(basename $0) > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 > index a2d4d6c73d..91148383ad 100755 > --- a/tests/qemu-iotests/126 > +++ b/tests/qemu-iotests/126 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > # get standard environment, filters and checks > diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 > index 9e0d7d3be8..c9139ed5e6 100755 > --- a/tests/qemu-iotests/127 > +++ b/tests/qemu-iotests/127 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq=$(basename $0) > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 > index 5a6dde0c03..925f5c7e98 100755 > --- a/tests/qemu-iotests/128 > +++ b/tests/qemu-iotests/128 > @@ -24,7 +24,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > devname="eiodev$$" > diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 > index 2c4b94da1b..f2f2706b28 100755 > --- a/tests/qemu-iotests/130 > +++ b/tests/qemu-iotests/130 > @@ -26,7 +26,6 @@ owner=kwolf@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 > index 47da00e3aa..58c25f7abe 100755 > --- a/tests/qemu-iotests/131 > +++ b/tests/qemu-iotests/131 > @@ -24,7 +24,6 @@ owner=den@openvz.org > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 > index 9bca244c90..a9a47a3c36 100755 > --- a/tests/qemu-iotests/133 > +++ b/tests/qemu-iotests/133 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 > index 934c6c534a..cacabcd28b 100755 > --- a/tests/qemu-iotests/134 > +++ b/tests/qemu-iotests/134 > @@ -24,7 +24,6 @@ owner=berrange@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 > index b12246fee9..a18a0c7230 100755 > --- a/tests/qemu-iotests/135 > +++ b/tests/qemu-iotests/135 > @@ -24,7 +24,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 > index 19e8597306..09cd4450ca 100755 > --- a/tests/qemu-iotests/137 > +++ b/tests/qemu-iotests/137 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 > index 21650d8197..eccbcae3a6 100755 > --- a/tests/qemu-iotests/138 > +++ b/tests/qemu-iotests/138 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 > index a8fc95145c..d4623b5a5d 100755 > --- a/tests/qemu-iotests/140 > +++ b/tests/qemu-iotests/140 > @@ -28,7 +28,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 > index 4246d387a1..e2408c7988 100755 > --- a/tests/qemu-iotests/141 > +++ b/tests/qemu-iotests/141 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 > index 0ac1402f55..c7c360d11b 100755 > --- a/tests/qemu-iotests/142 > +++ b/tests/qemu-iotests/142 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 > index 5ff1944507..d6302cc06d 100755 > --- a/tests/qemu-iotests/143 > +++ b/tests/qemu-iotests/143 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 > index 15909fe7bd..118c099994 100755 > --- a/tests/qemu-iotests/144 > +++ b/tests/qemu-iotests/144 > @@ -26,7 +26,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > TMP_SNAP1=${TEST_DIR}/tmp.qcow2 > diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 > index f8f4849490..6ce8a46f92 100755 > --- a/tests/qemu-iotests/145 > +++ b/tests/qemu-iotests/145 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 > index c8e99a344a..3f61351ffe 100755 > --- a/tests/qemu-iotests/146 > +++ b/tests/qemu-iotests/146 > @@ -24,7 +24,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 > index ee8f6375f6..955b877efa 100755 > --- a/tests/qemu-iotests/150 > +++ b/tests/qemu-iotests/150 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 > index 0daeb1b005..00092b84b9 100755 > --- a/tests/qemu-iotests/153 > +++ b/tests/qemu-iotests/153 > @@ -24,7 +24,6 @@ owner=famz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > tmp=/tmp/$$ > status=1 # failure is the default! > > diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 > index cb68dbee00..4a4abf0589 100755 > --- a/tests/qemu-iotests/154 > +++ b/tests/qemu-iotests/154 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 > index 0a9a09802e..f97f96f666 100755 > --- a/tests/qemu-iotests/156 > +++ b/tests/qemu-iotests/156 > @@ -32,7 +32,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 > index 2bf02be465..c3231b787a 100755 > --- a/tests/qemu-iotests/157 > +++ b/tests/qemu-iotests/157 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 > index 168f331197..d277ddcc94 100755 > --- a/tests/qemu-iotests/158 > +++ b/tests/qemu-iotests/158 > @@ -24,7 +24,6 @@ owner=berrange@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 > index 9b0e1ecc90..e74b2739de 100755 > --- a/tests/qemu-iotests/159 > +++ b/tests/qemu-iotests/159 > @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 > > _cleanup() > diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 > index 5c910e5bfc..92fff45d10 100755 > --- a/tests/qemu-iotests/160 > +++ b/tests/qemu-iotests/160 > @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 > > _cleanup() > diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 > index 477a806360..ef02d844a2 100755 > --- a/tests/qemu-iotests/162 > +++ b/tests/qemu-iotests/162 > @@ -25,7 +25,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 > index b79359fc4e..861eabf5cc 100755 > --- a/tests/qemu-iotests/170 > +++ b/tests/qemu-iotests/170 > @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 > > _cleanup() > diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 > index 910f18fd59..5b46069fde 100755 > --- a/tests/qemu-iotests/171 > +++ b/tests/qemu-iotests/171 > @@ -25,7 +25,6 @@ owner=tgolembi@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 > index 203554b30a..c5ee33ee81 100755 > --- a/tests/qemu-iotests/172 > +++ b/tests/qemu-iotests/172 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 > index f657becd80..1fe8c5d738 100755 > --- a/tests/qemu-iotests/173 > +++ b/tests/qemu-iotests/173 > @@ -24,7 +24,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 > index bc8d6df3f6..d8bb05c4e2 100755 > --- a/tests/qemu-iotests/174 > +++ b/tests/qemu-iotests/174 > @@ -24,7 +24,6 @@ owner=nirsof@gmail.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 > index e3c904695d..ebbeb6e74c 100755 > --- a/tests/qemu-iotests/175 > +++ b/tests/qemu-iotests/175 > @@ -24,7 +24,6 @@ owner=nirsof@gmail.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 > index 32baa116dd..c091d0bd1e 100755 > --- a/tests/qemu-iotests/176 > +++ b/tests/qemu-iotests/176 > @@ -29,7 +29,6 @@ owner=mreitz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 > index dfd5723c8b..7bf8e1daf3 100755 > --- a/tests/qemu-iotests/177 > +++ b/tests/qemu-iotests/177 > @@ -24,7 +24,6 @@ owner=eblake@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 > index 5d25a50d03..3f4b4a4564 100755 > --- a/tests/qemu-iotests/178 > +++ b/tests/qemu-iotests/178 > @@ -24,7 +24,6 @@ owner=stefanha@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179 > index 115944a753..3040631636 100755 > --- a/tests/qemu-iotests/179 > +++ b/tests/qemu-iotests/179 > @@ -24,7 +24,6 @@ owner=eblake@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 > index c05318096a..0c44108dac 100755 > --- a/tests/qemu-iotests/181 > +++ b/tests/qemu-iotests/181 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > MIG_SOCKET="${TEST_DIR}/migrate" > diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 > index 4b31592fb8..9e0944d49a 100755 > --- a/tests/qemu-iotests/182 > +++ b/tests/qemu-iotests/182 > @@ -24,7 +24,6 @@ owner=famz@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > tmp=/tmp/$$ > status=1 # failure is the default! > > diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 > index b28701302b..ebb5e304ac 100755 > --- a/tests/qemu-iotests/183 > +++ b/tests/qemu-iotests/183 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > MIG_SOCKET="${TEST_DIR}/migrate" > diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 > index a36a2e3270..2f3259d558 100755 > --- a/tests/qemu-iotests/184 > +++ b/tests/qemu-iotests/184 > @@ -24,7 +24,6 @@ owner="Manos Pitsidianakis" > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > trap "exit \$status" 0 1 2 3 15 > diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 > index 80dca40465..d8f1505cd8 100755 > --- a/tests/qemu-iotests/185 > +++ b/tests/qemu-iotests/185 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 > index ab71a30c14..29681bf45c 100755 > --- a/tests/qemu-iotests/186 > +++ b/tests/qemu-iotests/186 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 > index 6affdc253c..1feddca508 100755 > --- a/tests/qemu-iotests/187 > +++ b/tests/qemu-iotests/187 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 > index d946b9699d..af40e496ee 100755 > --- a/tests/qemu-iotests/188 > +++ b/tests/qemu-iotests/188 > @@ -24,7 +24,6 @@ owner=berrange@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 > index e98001fd99..222bec133b 100755 > --- a/tests/qemu-iotests/189 > +++ b/tests/qemu-iotests/189 > @@ -24,7 +24,6 @@ owner=berrange@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 > index fce04e2f3f..95ba06d8f4 100755 > --- a/tests/qemu-iotests/190 > +++ b/tests/qemu-iotests/190 > @@ -24,7 +24,6 @@ owner=eblake@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 > index 7de80df778..198272ea3b 100755 > --- a/tests/qemu-iotests/191 > +++ b/tests/qemu-iotests/191 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 > index ee8fd2d841..415c706db5 100755 > --- a/tests/qemu-iotests/192 > +++ b/tests/qemu-iotests/192 > @@ -25,7 +25,6 @@ owner=famz@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 > index 7784b1f363..f56f255715 100755 > --- a/tests/qemu-iotests/195 > +++ b/tests/qemu-iotests/195 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 > index 0369aa5cff..8170f5d4ab 100755 > --- a/tests/qemu-iotests/197 > +++ b/tests/qemu-iotests/197 > @@ -24,7 +24,6 @@ owner=eblake@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > # get standard environment, filters and checks > diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198 > index c23bd16ea7..4d961f4f3a 100755 > --- a/tests/qemu-iotests/198 > +++ b/tests/qemu-iotests/198 > @@ -24,7 +24,6 @@ owner=berrange@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 > index 4f5d5b3b23..b9ebd5a8c7 100755 > --- a/tests/qemu-iotests/200 > +++ b/tests/qemu-iotests/200 > @@ -26,7 +26,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/204 b/tests/qemu-iotests/204 > index 0ec550a691..57f3afe1d7 100755 > --- a/tests/qemu-iotests/204 > +++ b/tests/qemu-iotests/204 > @@ -24,7 +24,6 @@ owner=eblake@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 > index c46ca2a6dd..7a2d5391bb 100755 > --- a/tests/qemu-iotests/214 > +++ b/tests/qemu-iotests/214 > @@ -22,7 +22,6 @@ > seq=$(basename "$0") > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215 > index 2e616ed659..230fd2551a 100755 > --- a/tests/qemu-iotests/215 > +++ b/tests/qemu-iotests/215 > @@ -21,7 +21,6 @@ > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > # get standard environment, filters and checks > diff --git a/tests/qemu-iotests/221 b/tests/qemu-iotests/221 > index 41c4e4bdf8..06f48f1f23 100755 > --- a/tests/qemu-iotests/221 > +++ b/tests/qemu-iotests/221 > @@ -21,7 +21,6 @@ > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223 > index 8b1859c2dd..58a3f3ff40 100755 > --- a/tests/qemu-iotests/223 > +++ b/tests/qemu-iotests/223 > @@ -21,7 +21,6 @@ > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225 > index f2ee715685..e42ee94ff0 100755 > --- a/tests/qemu-iotests/225 > +++ b/tests/qemu-iotests/225 > @@ -24,7 +24,6 @@ owner=mreitz@redhat.com > seq=$(basename $0) > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226 > index c396edb6ab..aec413b23c 100755 > --- a/tests/qemu-iotests/226 > +++ b/tests/qemu-iotests/226 > @@ -25,7 +25,6 @@ owner=jsnow@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227 > index 9a5f7f9f14..43f2323ff2 100755 > --- a/tests/qemu-iotests/227 > +++ b/tests/qemu-iotests/227 > @@ -24,7 +24,6 @@ owner=kwolf@redhat.com > seq=$(basename $0) > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229 > index ff851ec431..86602437ff 100755 > --- a/tests/qemu-iotests/229 > +++ b/tests/qemu-iotests/229 > @@ -25,7 +25,6 @@ owner=jcody@redhat.com > seq="$(basename $0)" > echo "QA output created by $seq" > > -here="$PWD" > status=1 # failure is the default! > > _cleanup() > diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231 > index e044cea9b5..e9f8aaacd3 100755 > --- a/tests/qemu-iotests/231 > +++ b/tests/qemu-iotests/231 > @@ -26,7 +26,6 @@ owner=jcody@redhat.com > seq=`basename $0` > echo "QA output created by $seq" > > -here=$PWD > status=1 # failure is the default! > > _cleanup() > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variablehere 2018-10-24 23:26 ` Philippe Mathieu-Daudé @ 2018-10-25 9:34 ` maozy 2018-11-16 16:49 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here Eric Blake 1 sibling, 0 replies; 11+ messages in thread From: maozy @ 2018-10-25 9:34 UTC (permalink / raw) To: Philippe Mathieu-Daudé, qemu-devel, mreitz, Eric Blake; +Cc: kwolf Hi, Philippe On 10/25/18 7:26 AM, Philippe Mathieu-Daudé wrote: > Hi Mao, > > On 24/10/18 11:40, Mao Zhongyi wrote: >> run >> git grep '\$here' tests/qemu-iotests > > This command doesn't look correct, I believe you have to use either > > - git grep '$here' > or > - git grep \$here > Yeah, it should be '$here' or \$here ... :) I hope whoever is going to push this series can fix it before pushing. If not please let me know and I am going to send a v3. Thanks in advance. Mao >> >> has 0 hits, which means we are setting a variable that >> no use, so execute the following cmd to remove all of >> the 'here=...' lines as dead code. > > This seems to have been removed in e8f8624d3b920de. > >> >> sed -i '/here=/d' $(git grep -l 'here=' tests/qemu-iotests) >> >> Cc: kwolf@redhat.com >> Cc: mreitz@redhat.com >> Cc: eblake@redhat.com >> >> Suggested-by: Eric Blake <eblake@redhat.com> > > Please Cc Eric if he suggested, so he can review. > >> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> >> --- >> tests/qemu-iotests/001 | 1 - >> tests/qemu-iotests/002 | 1 - >> tests/qemu-iotests/003 | 1 - >> tests/qemu-iotests/004 | 1 - >> tests/qemu-iotests/005 | 1 - >> tests/qemu-iotests/007 | 1 - >> tests/qemu-iotests/008 | 1 - >> tests/qemu-iotests/009 | 1 - >> tests/qemu-iotests/010 | 1 - >> tests/qemu-iotests/011 | 1 - >> tests/qemu-iotests/012 | 1 - >> tests/qemu-iotests/013 | 1 - >> tests/qemu-iotests/014 | 1 - >> tests/qemu-iotests/015 | 1 - >> tests/qemu-iotests/017 | 1 - >> tests/qemu-iotests/018 | 1 - >> tests/qemu-iotests/019 | 1 - >> tests/qemu-iotests/020 | 1 - >> tests/qemu-iotests/021 | 1 - >> tests/qemu-iotests/022 | 1 - >> tests/qemu-iotests/023 | 1 - >> tests/qemu-iotests/024 | 1 - >> tests/qemu-iotests/025 | 1 - >> tests/qemu-iotests/026 | 1 - >> tests/qemu-iotests/027 | 1 - >> tests/qemu-iotests/028 | 1 - >> tests/qemu-iotests/029 | 1 - >> tests/qemu-iotests/031 | 1 - >> tests/qemu-iotests/032 | 1 - >> tests/qemu-iotests/033 | 1 - >> tests/qemu-iotests/034 | 1 - >> tests/qemu-iotests/035 | 1 - >> tests/qemu-iotests/036 | 1 - >> tests/qemu-iotests/037 | 1 - >> tests/qemu-iotests/038 | 1 - >> tests/qemu-iotests/039 | 1 - >> tests/qemu-iotests/042 | 1 - >> tests/qemu-iotests/043 | 1 - >> tests/qemu-iotests/046 | 1 - >> tests/qemu-iotests/047 | 1 - >> tests/qemu-iotests/049 | 1 - >> tests/qemu-iotests/050 | 1 - >> tests/qemu-iotests/051 | 1 - >> tests/qemu-iotests/052 | 1 - >> tests/qemu-iotests/053 | 1 - >> tests/qemu-iotests/054 | 1 - >> tests/qemu-iotests/058 | 1 - >> tests/qemu-iotests/059 | 1 - >> tests/qemu-iotests/060 | 1 - >> tests/qemu-iotests/061 | 1 - >> tests/qemu-iotests/062 | 1 - >> tests/qemu-iotests/063 | 1 - >> tests/qemu-iotests/064 | 1 - >> tests/qemu-iotests/066 | 1 - >> tests/qemu-iotests/067 | 1 - >> tests/qemu-iotests/068 | 1 - >> tests/qemu-iotests/069 | 1 - >> tests/qemu-iotests/070 | 1 - >> tests/qemu-iotests/071 | 1 - >> tests/qemu-iotests/072 | 1 - >> tests/qemu-iotests/073 | 1 - >> tests/qemu-iotests/075 | 1 - >> tests/qemu-iotests/076 | 1 - >> tests/qemu-iotests/077 | 1 - >> tests/qemu-iotests/078 | 1 - >> tests/qemu-iotests/079 | 1 - >> tests/qemu-iotests/080 | 1 - >> tests/qemu-iotests/081 | 1 - >> tests/qemu-iotests/082 | 1 - >> tests/qemu-iotests/083 | 1 - >> tests/qemu-iotests/084 | 1 - >> tests/qemu-iotests/085 | 1 - >> tests/qemu-iotests/086 | 1 - >> tests/qemu-iotests/087 | 1 - >> tests/qemu-iotests/088 | 1 - >> tests/qemu-iotests/089 | 1 - >> tests/qemu-iotests/090 | 1 - >> tests/qemu-iotests/091 | 1 - >> tests/qemu-iotests/092 | 1 - >> tests/qemu-iotests/094 | 1 - >> tests/qemu-iotests/095 | 1 - >> tests/qemu-iotests/097 | 1 - >> tests/qemu-iotests/098 | 1 - >> tests/qemu-iotests/099 | 1 - >> tests/qemu-iotests/101 | 1 - >> tests/qemu-iotests/102 | 1 - >> tests/qemu-iotests/103 | 1 - >> tests/qemu-iotests/104 | 1 - >> tests/qemu-iotests/105 | 1 - >> tests/qemu-iotests/106 | 1 - >> tests/qemu-iotests/107 | 1 - >> tests/qemu-iotests/108 | 1 - >> tests/qemu-iotests/109 | 1 - >> tests/qemu-iotests/110 | 1 - >> tests/qemu-iotests/111 | 1 - >> tests/qemu-iotests/112 | 1 - >> tests/qemu-iotests/113 | 1 - >> tests/qemu-iotests/114 | 1 - >> tests/qemu-iotests/115 | 1 - >> tests/qemu-iotests/116 | 1 - >> tests/qemu-iotests/117 | 1 - >> tests/qemu-iotests/119 | 1 - >> tests/qemu-iotests/120 | 1 - >> tests/qemu-iotests/121 | 1 - >> tests/qemu-iotests/122 | 1 - >> tests/qemu-iotests/123 | 1 - >> tests/qemu-iotests/125 | 1 - >> tests/qemu-iotests/126 | 1 - >> tests/qemu-iotests/127 | 1 - >> tests/qemu-iotests/128 | 1 - >> tests/qemu-iotests/130 | 1 - >> tests/qemu-iotests/131 | 1 - >> tests/qemu-iotests/133 | 1 - >> tests/qemu-iotests/134 | 1 - >> tests/qemu-iotests/135 | 1 - >> tests/qemu-iotests/137 | 1 - >> tests/qemu-iotests/138 | 1 - >> tests/qemu-iotests/140 | 1 - >> tests/qemu-iotests/141 | 1 - >> tests/qemu-iotests/142 | 1 - >> tests/qemu-iotests/143 | 1 - >> tests/qemu-iotests/144 | 1 - >> tests/qemu-iotests/145 | 1 - >> tests/qemu-iotests/146 | 1 - >> tests/qemu-iotests/150 | 1 - >> tests/qemu-iotests/153 | 1 - >> tests/qemu-iotests/154 | 1 - >> tests/qemu-iotests/156 | 1 - >> tests/qemu-iotests/157 | 1 - >> tests/qemu-iotests/158 | 1 - >> tests/qemu-iotests/159 | 1 - >> tests/qemu-iotests/160 | 1 - >> tests/qemu-iotests/162 | 1 - >> tests/qemu-iotests/170 | 1 - >> tests/qemu-iotests/171 | 1 - >> tests/qemu-iotests/172 | 1 - >> tests/qemu-iotests/173 | 1 - >> tests/qemu-iotests/174 | 1 - >> tests/qemu-iotests/175 | 1 - >> tests/qemu-iotests/176 | 1 - >> tests/qemu-iotests/177 | 1 - >> tests/qemu-iotests/178 | 1 - >> tests/qemu-iotests/179 | 1 - >> tests/qemu-iotests/181 | 1 - >> tests/qemu-iotests/182 | 1 - >> tests/qemu-iotests/183 | 1 - >> tests/qemu-iotests/184 | 1 - >> tests/qemu-iotests/185 | 1 - >> tests/qemu-iotests/186 | 1 - >> tests/qemu-iotests/187 | 1 - >> tests/qemu-iotests/188 | 1 - >> tests/qemu-iotests/189 | 1 - >> tests/qemu-iotests/190 | 1 - >> tests/qemu-iotests/191 | 1 - >> tests/qemu-iotests/192 | 1 - >> tests/qemu-iotests/195 | 1 - >> tests/qemu-iotests/197 | 1 - >> tests/qemu-iotests/198 | 1 - >> tests/qemu-iotests/200 | 1 - >> tests/qemu-iotests/204 | 1 - >> tests/qemu-iotests/214 | 1 - >> tests/qemu-iotests/215 | 1 - >> tests/qemu-iotests/221 | 1 - >> tests/qemu-iotests/223 | 1 - >> tests/qemu-iotests/225 | 1 - >> tests/qemu-iotests/226 | 1 - >> tests/qemu-iotests/227 | 1 - >> tests/qemu-iotests/229 | 1 - >> tests/qemu-iotests/231 | 1 - >> 169 files changed, 169 deletions(-) >> >> diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 >> index 42a57e4e86..55dcbb71d9 100755 >> --- a/tests/qemu-iotests/001 >> +++ b/tests/qemu-iotests/001 >> @@ -24,7 +24,6 @@ owner=hch@lst.de >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 >> index 70799f8a9a..74572b4711 100755 >> --- a/tests/qemu-iotests/002 >> +++ b/tests/qemu-iotests/002 >> @@ -24,7 +24,6 @@ owner=hch@lst.de >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 >> index d5396e54a5..bf2595559b 100755 >> --- a/tests/qemu-iotests/003 >> +++ b/tests/qemu-iotests/003 >> @@ -24,7 +24,6 @@ owner=hch@lst.de >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 >> index 9552cd31ea..841b15dfac 100755 >> --- a/tests/qemu-iotests/004 >> +++ b/tests/qemu-iotests/004 >> @@ -24,7 +24,6 @@ owner=hch@lst.de >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 >> index 1cf3d67b74..8aa4283a4d 100755 >> --- a/tests/qemu-iotests/005 >> +++ b/tests/qemu-iotests/005 >> @@ -27,7 +27,6 @@ owner=hch@lst.de >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 >> index e4ebcdea54..b983022a7f 100755 >> --- a/tests/qemu-iotests/007 >> +++ b/tests/qemu-iotests/007 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 >> index 62d9524045..8dfa10bcb8 100755 >> --- a/tests/qemu-iotests/008 >> +++ b/tests/qemu-iotests/008 >> @@ -24,7 +24,6 @@ owner=hch@lst.de >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 >> index fbcfe5cd17..73ae09db69 100755 >> --- a/tests/qemu-iotests/009 >> +++ b/tests/qemu-iotests/009 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 >> index 285e7bf960..751aca9813 100755 >> --- a/tests/qemu-iotests/010 >> +++ b/tests/qemu-iotests/010 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 >> index 4da1670083..35909564a9 100755 >> --- a/tests/qemu-iotests/011 >> +++ b/tests/qemu-iotests/011 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 >> index a35bbd58e1..de9a5fb4d5 100755 >> --- a/tests/qemu-iotests/012 >> +++ b/tests/qemu-iotests/012 >> @@ -26,7 +26,6 @@ owner=hch@lst.de >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 >> index 3a9668cad0..5e1efcee28 100755 >> --- a/tests/qemu-iotests/013 >> +++ b/tests/qemu-iotests/013 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 >> index 1404d14eff..9ade571a95 100755 >> --- a/tests/qemu-iotests/014 >> +++ b/tests/qemu-iotests/014 >> @@ -26,7 +26,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 >> index fd43f80503..21f7d42c84 100755 >> --- a/tests/qemu-iotests/015 >> +++ b/tests/qemu-iotests/015 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 >> index a0de5ed878..1ac6f74502 100755 >> --- a/tests/qemu-iotests/017 >> +++ b/tests/qemu-iotests/017 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 >> index fab2fc1803..bba30a1be2 100755 >> --- a/tests/qemu-iotests/018 >> +++ b/tests/qemu-iotests/018 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 >> index 5697d109b6..8f911a79c1 100755 >> --- a/tests/qemu-iotests/019 >> +++ b/tests/qemu-iotests/019 >> @@ -26,7 +26,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 >> index 7b066d19a3..6b972d082f 100755 >> --- a/tests/qemu-iotests/020 >> +++ b/tests/qemu-iotests/020 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 >> index e568f38c69..c15ebf9eb8 100755 >> --- a/tests/qemu-iotests/021 >> +++ b/tests/qemu-iotests/021 >> @@ -24,7 +24,6 @@ owner=hch@lst.de >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 >> index a438a8862d..44765c7b7a 100755 >> --- a/tests/qemu-iotests/022 >> +++ b/tests/qemu-iotests/022 >> @@ -26,7 +26,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 >> index 23b16a4d9b..c8e1b9a761 100755 >> --- a/tests/qemu-iotests/023 >> +++ b/tests/qemu-iotests/023 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 >> index a91200cd59..428b5c815d 100755 >> --- a/tests/qemu-iotests/024 >> +++ b/tests/qemu-iotests/024 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 >> index 17f7d17673..fcd4d97c17 100755 >> --- a/tests/qemu-iotests/025 >> +++ b/tests/qemu-iotests/025 >> @@ -24,7 +24,6 @@ owner=stefanha@linux.vnet.ibm.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 >> index 84d3bd509f..31276d9027 100755 >> --- a/tests/qemu-iotests/026 >> +++ b/tests/qemu-iotests/026 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 >> index 33539cc769..2c46ae1457 100755 >> --- a/tests/qemu-iotests/027 >> +++ b/tests/qemu-iotests/027 >> @@ -24,7 +24,6 @@ owner=stefanha@linux.vnet.ibm.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 >> index ad87aa0dae..a2a7c93bcd 100755 >> --- a/tests/qemu-iotests/028 >> +++ b/tests/qemu-iotests/028 >> @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 >> index fc430c78de..cf0fe0f6a6 100755 >> --- a/tests/qemu-iotests/029 >> +++ b/tests/qemu-iotests/029 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 >> index ab599add77..ac0dfaed7d 100755 >> --- a/tests/qemu-iotests/031 >> +++ b/tests/qemu-iotests/031 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 >> index ce1dbaf086..3e86bb0111 100755 >> --- a/tests/qemu-iotests/032 >> +++ b/tests/qemu-iotests/032 >> @@ -26,7 +26,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 >> index 9492f17e5f..46b91388ef 100755 >> --- a/tests/qemu-iotests/033 >> +++ b/tests/qemu-iotests/033 >> @@ -24,7 +24,6 @@ owner=pbonzini@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 >> index f4ebad8edb..62812cd53c 100755 >> --- a/tests/qemu-iotests/034 >> +++ b/tests/qemu-iotests/034 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 >> index 522e5e8245..a5716caf32 100755 >> --- a/tests/qemu-iotests/035 >> +++ b/tests/qemu-iotests/035 >> @@ -25,7 +25,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 >> index ecb556ef26..4e76602a93 100755 >> --- a/tests/qemu-iotests/036 >> +++ b/tests/qemu-iotests/036 >> @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 >> index 95a7e7731b..2e43b19ed0 100755 >> --- a/tests/qemu-iotests/037 >> +++ b/tests/qemu-iotests/037 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 >> index 338123d5f2..4e03976023 100755 >> --- a/tests/qemu-iotests/038 >> +++ b/tests/qemu-iotests/038 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 >> index caf245def0..b3c344cb27 100755 >> --- a/tests/qemu-iotests/039 >> +++ b/tests/qemu-iotests/039 >> @@ -27,7 +27,6 @@ owner=stefanha@linux.vnet.ibm.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 >> index e5ce618766..beaa339000 100755 >> --- a/tests/qemu-iotests/042 >> +++ b/tests/qemu-iotests/042 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 >> index 8bbb72695f..fc9005b28f 100755 >> --- a/tests/qemu-iotests/043 >> +++ b/tests/qemu-iotests/043 >> @@ -24,7 +24,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 >> index 79de8064ec..01c0de62d8 100755 >> --- a/tests/qemu-iotests/046 >> +++ b/tests/qemu-iotests/046 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 >> index 07e391d7ea..c168373cf0 100755 >> --- a/tests/qemu-iotests/047 >> +++ b/tests/qemu-iotests/047 >> @@ -25,7 +25,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 >> index a456d097d4..4d0ad5cd50 100755 >> --- a/tests/qemu-iotests/049 >> +++ b/tests/qemu-iotests/049 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 >> index 294dffb88c..963a0db97f 100755 >> --- a/tests/qemu-iotests/050 >> +++ b/tests/qemu-iotests/050 >> @@ -24,7 +24,6 @@ owner=pbonzini@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 >> index 69adc791df..a676da8273 100755 >> --- a/tests/qemu-iotests/051 >> +++ b/tests/qemu-iotests/051 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 >> index aefff4bff5..b992adf4ff 100755 >> --- a/tests/qemu-iotests/052 >> +++ b/tests/qemu-iotests/052 >> @@ -24,7 +24,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 >> index f04b88bbc1..afa109c950 100755 >> --- a/tests/qemu-iotests/053 >> +++ b/tests/qemu-iotests/053 >> @@ -24,7 +24,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 >> index 4e6361f0d9..cf88a7c76e 100755 >> --- a/tests/qemu-iotests/054 >> +++ b/tests/qemu-iotests/054 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 >> index 1ba0cbee25..0d741a7cac 100755 >> --- a/tests/qemu-iotests/058 >> +++ b/tests/qemu-iotests/058 >> @@ -26,7 +26,6 @@ owner=xiawenc@linux.vnet.ibm.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> nbd_unix_socket=$TEST_DIR/test_qemu_nbd_socket >> diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 >> index 2bfdb941f6..54d5567acc 100755 >> --- a/tests/qemu-iotests/059 >> +++ b/tests/qemu-iotests/059 >> @@ -24,7 +24,6 @@ owner=famz@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 >> index 74ad371885..af0588ae9a 100755 >> --- a/tests/qemu-iotests/060 >> +++ b/tests/qemu-iotests/060 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 >> index 92c1889333..1a50163419 100755 >> --- a/tests/qemu-iotests/061 >> +++ b/tests/qemu-iotests/061 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 >> index 6d1638711c..985fbef41e 100755 >> --- a/tests/qemu-iotests/062 >> +++ b/tests/qemu-iotests/062 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 >> index 6daf389a3d..041fb5c1ac 100755 >> --- a/tests/qemu-iotests/063 >> +++ b/tests/qemu-iotests/063 >> @@ -25,7 +25,6 @@ owner=alex@alex.org.uk >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 >> index 22d5678e3d..f55ff37ca7 100755 >> --- a/tests/qemu-iotests/064 >> +++ b/tests/qemu-iotests/064 >> @@ -24,7 +24,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 >> index 8638217736..26c043711b 100755 >> --- a/tests/qemu-iotests/066 >> +++ b/tests/qemu-iotests/066 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 >> index 62dc3e820d..f8d584f487 100755 >> --- a/tests/qemu-iotests/067 >> +++ b/tests/qemu-iotests/067 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> # get standard environment, filters and checks >> diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 >> index e7fca6a494..f0583d52ae 100755 >> --- a/tests/qemu-iotests/068 >> +++ b/tests/qemu-iotests/068 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 >> index 96e55ef216..fdee121f43 100755 >> --- a/tests/qemu-iotests/069 >> +++ b/tests/qemu-iotests/069 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 >> index 6fbb95a086..78e0390f5f 100755 >> --- a/tests/qemu-iotests/070 >> +++ b/tests/qemu-iotests/070 >> @@ -25,7 +25,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 >> index 48b495513f..6448e9e75b 100755 >> --- a/tests/qemu-iotests/071 >> +++ b/tests/qemu-iotests/071 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 >> index aa027c7d29..08ef29f5b4 100755 >> --- a/tests/qemu-iotests/072 >> +++ b/tests/qemu-iotests/072 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 >> index c572d9afcc..5e7f76cb7f 100755 >> --- a/tests/qemu-iotests/073 >> +++ b/tests/qemu-iotests/073 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 >> index df5f88a43c..45b8901ef0 100755 >> --- a/tests/qemu-iotests/075 >> +++ b/tests/qemu-iotests/075 >> @@ -24,7 +24,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 >> index 35bce0b210..3b5ab3fd08 100755 >> --- a/tests/qemu-iotests/076 >> +++ b/tests/qemu-iotests/076 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 >> index 8e6a9a598f..a40f319d37 100755 >> --- a/tests/qemu-iotests/077 >> +++ b/tests/qemu-iotests/077 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 >> index 86b0e95897..68d0ea8802 100755 >> --- a/tests/qemu-iotests/078 >> +++ b/tests/qemu-iotests/078 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 >> index da0e441d54..fca2f77d37 100755 >> --- a/tests/qemu-iotests/079 >> +++ b/tests/qemu-iotests/079 >> @@ -24,7 +24,6 @@ owner=hutao@cn.fujitsu.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 >> index 14f3d7f275..cec2376f59 100755 >> --- a/tests/qemu-iotests/080 >> +++ b/tests/qemu-iotests/080 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 >> index b30a7c4331..c5d4616630 100755 >> --- a/tests/qemu-iotests/081 >> +++ b/tests/qemu-iotests/081 >> @@ -24,7 +24,6 @@ owner=benoit@irqsave.net >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 >> index e8008f2044..14f6631071 100755 >> --- a/tests/qemu-iotests/082 >> +++ b/tests/qemu-iotests/082 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 >> index a42a2e1819..982adecf02 100755 >> --- a/tests/qemu-iotests/083 >> +++ b/tests/qemu-iotests/083 >> @@ -24,7 +24,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 >> index 559c8ed1ea..e131fa9642 100755 >> --- a/tests/qemu-iotests/084 >> +++ b/tests/qemu-iotests/084 >> @@ -25,7 +25,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 >> index 0786b28503..2ef84077b8 100755 >> --- a/tests/qemu-iotests/085 >> +++ b/tests/qemu-iotests/085 >> @@ -29,7 +29,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> snapshot_virt0="snapshot-v0.qcow2" >> diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 >> index 442e63afc4..971de7dc35 100755 >> --- a/tests/qemu-iotests/086 >> +++ b/tests/qemu-iotests/086 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 >> index 4303e0e62b..109cdf5ea4 100755 >> --- a/tests/qemu-iotests/087 >> +++ b/tests/qemu-iotests/087 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> # get standard environment, filters and checks >> diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 >> index e55b67cd69..c5e9ab42c7 100755 >> --- a/tests/qemu-iotests/088 >> +++ b/tests/qemu-iotests/088 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 >> index aa1ba4a98e..3165d79e2a 100755 >> --- a/tests/qemu-iotests/089 >> +++ b/tests/qemu-iotests/089 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 >> index 7380503d57..1450993e15 100755 >> --- a/tests/qemu-iotests/090 >> +++ b/tests/qemu-iotests/090 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 >> index 2e66ed31b9..2f2f98ee64 100755 >> --- a/tests/qemu-iotests/091 >> +++ b/tests/qemu-iotests/091 >> @@ -26,7 +26,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> MIG_FIFO="${TEST_DIR}/migrate" >> diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 >> index be71add468..8e318f10b9 100755 >> --- a/tests/qemu-iotests/092 >> +++ b/tests/qemu-iotests/092 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 >> index 9aa01e3627..7adc9b9138 100755 >> --- a/tests/qemu-iotests/094 >> +++ b/tests/qemu-iotests/094 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 >> index 3ce960502c..9fc47f6b87 100755 >> --- a/tests/qemu-iotests/095 >> +++ b/tests/qemu-iotests/095 >> @@ -27,7 +27,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 >> index e22670c8d0..7234b16053 100755 >> --- a/tests/qemu-iotests/097 >> +++ b/tests/qemu-iotests/097 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 >> index b002e969b3..c7977da99a 100755 >> --- a/tests/qemu-iotests/098 >> +++ b/tests/qemu-iotests/098 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 >> index caaf58eee5..4a6275d4bc 100755 >> --- a/tests/qemu-iotests/099 >> +++ b/tests/qemu-iotests/099 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 >> index 6022eb31fc..3001ba3c0a 100755 >> --- a/tests/qemu-iotests/101 >> +++ b/tests/qemu-iotests/101 >> @@ -24,7 +24,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 >> index 04b3f28445..29a6a940e2 100755 >> --- a/tests/qemu-iotests/102 >> +++ b/tests/qemu-iotests/102 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq=$(basename $0) >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 >> index 2841318492..66f8167f02 100755 >> --- a/tests/qemu-iotests/103 >> +++ b/tests/qemu-iotests/103 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq=$(basename $0) >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 >> index b790c89528..34bb0d23ba 100755 >> --- a/tests/qemu-iotests/104 >> +++ b/tests/qemu-iotests/104 >> @@ -24,7 +24,6 @@ owner=hutao@cn.fujitsu.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> trap "exit \$status" 0 1 2 3 15 >> diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 >> index 3c125bf163..943bda2f4f 100755 >> --- a/tests/qemu-iotests/105 >> +++ b/tests/qemu-iotests/105 >> @@ -24,7 +24,6 @@ owner=famz@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 >> index 5e51f88a78..4129fee6bc 100755 >> --- a/tests/qemu-iotests/106 >> +++ b/tests/qemu-iotests/106 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq=$(basename $0) >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 >> index d7222dc1c9..5d70ad2007 100755 >> --- a/tests/qemu-iotests/107 >> +++ b/tests/qemu-iotests/107 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 >> index 2355d98c1d..58e8ad7636 100755 >> --- a/tests/qemu-iotests/108 >> +++ b/tests/qemu-iotests/108 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 >> index acbd079136..90bdae459b 100755 >> --- a/tests/qemu-iotests/109 >> +++ b/tests/qemu-iotests/109 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 >> index 9de7369f3a..b64b3b215a 100755 >> --- a/tests/qemu-iotests/110 >> +++ b/tests/qemu-iotests/110 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 >> index a1c152d0c1..e15e66ac5d 100755 >> --- a/tests/qemu-iotests/111 >> +++ b/tests/qemu-iotests/111 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 >> index 28eb9aae93..fba2965322 100755 >> --- a/tests/qemu-iotests/112 >> +++ b/tests/qemu-iotests/112 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 >> index 4e09810905..d8d78c46dc 100755 >> --- a/tests/qemu-iotests/113 >> +++ b/tests/qemu-iotests/113 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 >> index 5b7dc5496c..e17fb514cb 100755 >> --- a/tests/qemu-iotests/114 >> +++ b/tests/qemu-iotests/114 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 >> index 665c2ead41..0581e03c26 100755 >> --- a/tests/qemu-iotests/115 >> +++ b/tests/qemu-iotests/115 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 >> index bb75a33e78..f8a27b9c02 100755 >> --- a/tests/qemu-iotests/116 >> +++ b/tests/qemu-iotests/116 >> @@ -27,7 +27,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 >> index 6c83461182..e533e230a3 100755 >> --- a/tests/qemu-iotests/117 >> +++ b/tests/qemu-iotests/117 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 >> index 4f34fb4343..32810d52c9 100755 >> --- a/tests/qemu-iotests/119 >> +++ b/tests/qemu-iotests/119 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 >> index f40b97d099..76afdf449b 100755 >> --- a/tests/qemu-iotests/120 >> +++ b/tests/qemu-iotests/120 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 >> index 6d6f55a5dc..d2885c700f 100755 >> --- a/tests/qemu-iotests/121 >> +++ b/tests/qemu-iotests/121 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 >> index d8c8ad722d..eab3399dd6 100755 >> --- a/tests/qemu-iotests/122 >> +++ b/tests/qemu-iotests/122 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 >> index b18e3fca9a..168b985c8b 100755 >> --- a/tests/qemu-iotests/123 >> +++ b/tests/qemu-iotests/123 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 >> index c20c71570c..778c874933 100755 >> --- a/tests/qemu-iotests/125 >> +++ b/tests/qemu-iotests/125 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq=$(basename $0) >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 >> index a2d4d6c73d..91148383ad 100755 >> --- a/tests/qemu-iotests/126 >> +++ b/tests/qemu-iotests/126 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> # get standard environment, filters and checks >> diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 >> index 9e0d7d3be8..c9139ed5e6 100755 >> --- a/tests/qemu-iotests/127 >> +++ b/tests/qemu-iotests/127 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq=$(basename $0) >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 >> index 5a6dde0c03..925f5c7e98 100755 >> --- a/tests/qemu-iotests/128 >> +++ b/tests/qemu-iotests/128 >> @@ -24,7 +24,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> devname="eiodev$$" >> diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 >> index 2c4b94da1b..f2f2706b28 100755 >> --- a/tests/qemu-iotests/130 >> +++ b/tests/qemu-iotests/130 >> @@ -26,7 +26,6 @@ owner=kwolf@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 >> index 47da00e3aa..58c25f7abe 100755 >> --- a/tests/qemu-iotests/131 >> +++ b/tests/qemu-iotests/131 >> @@ -24,7 +24,6 @@ owner=den@openvz.org >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 >> index 9bca244c90..a9a47a3c36 100755 >> --- a/tests/qemu-iotests/133 >> +++ b/tests/qemu-iotests/133 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 >> index 934c6c534a..cacabcd28b 100755 >> --- a/tests/qemu-iotests/134 >> +++ b/tests/qemu-iotests/134 >> @@ -24,7 +24,6 @@ owner=berrange@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 >> index b12246fee9..a18a0c7230 100755 >> --- a/tests/qemu-iotests/135 >> +++ b/tests/qemu-iotests/135 >> @@ -24,7 +24,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 >> index 19e8597306..09cd4450ca 100755 >> --- a/tests/qemu-iotests/137 >> +++ b/tests/qemu-iotests/137 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 >> index 21650d8197..eccbcae3a6 100755 >> --- a/tests/qemu-iotests/138 >> +++ b/tests/qemu-iotests/138 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 >> index a8fc95145c..d4623b5a5d 100755 >> --- a/tests/qemu-iotests/140 >> +++ b/tests/qemu-iotests/140 >> @@ -28,7 +28,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 >> index 4246d387a1..e2408c7988 100755 >> --- a/tests/qemu-iotests/141 >> +++ b/tests/qemu-iotests/141 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 >> index 0ac1402f55..c7c360d11b 100755 >> --- a/tests/qemu-iotests/142 >> +++ b/tests/qemu-iotests/142 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 >> index 5ff1944507..d6302cc06d 100755 >> --- a/tests/qemu-iotests/143 >> +++ b/tests/qemu-iotests/143 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 >> index 15909fe7bd..118c099994 100755 >> --- a/tests/qemu-iotests/144 >> +++ b/tests/qemu-iotests/144 >> @@ -26,7 +26,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> TMP_SNAP1=${TEST_DIR}/tmp.qcow2 >> diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 >> index f8f4849490..6ce8a46f92 100755 >> --- a/tests/qemu-iotests/145 >> +++ b/tests/qemu-iotests/145 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 >> index c8e99a344a..3f61351ffe 100755 >> --- a/tests/qemu-iotests/146 >> +++ b/tests/qemu-iotests/146 >> @@ -24,7 +24,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 >> index ee8f6375f6..955b877efa 100755 >> --- a/tests/qemu-iotests/150 >> +++ b/tests/qemu-iotests/150 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 >> index 0daeb1b005..00092b84b9 100755 >> --- a/tests/qemu-iotests/153 >> +++ b/tests/qemu-iotests/153 >> @@ -24,7 +24,6 @@ owner=famz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> tmp=/tmp/$$ >> status=1 # failure is the default! >> diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 >> index cb68dbee00..4a4abf0589 100755 >> --- a/tests/qemu-iotests/154 >> +++ b/tests/qemu-iotests/154 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 >> index 0a9a09802e..f97f96f666 100755 >> --- a/tests/qemu-iotests/156 >> +++ b/tests/qemu-iotests/156 >> @@ -32,7 +32,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 >> index 2bf02be465..c3231b787a 100755 >> --- a/tests/qemu-iotests/157 >> +++ b/tests/qemu-iotests/157 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 >> index 168f331197..d277ddcc94 100755 >> --- a/tests/qemu-iotests/158 >> +++ b/tests/qemu-iotests/158 >> @@ -24,7 +24,6 @@ owner=berrange@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 >> index 9b0e1ecc90..e74b2739de 100755 >> --- a/tests/qemu-iotests/159 >> +++ b/tests/qemu-iotests/159 >> @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 >> _cleanup() >> diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 >> index 5c910e5bfc..92fff45d10 100755 >> --- a/tests/qemu-iotests/160 >> +++ b/tests/qemu-iotests/160 >> @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 >> _cleanup() >> diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 >> index 477a806360..ef02d844a2 100755 >> --- a/tests/qemu-iotests/162 >> +++ b/tests/qemu-iotests/162 >> @@ -25,7 +25,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 >> index b79359fc4e..861eabf5cc 100755 >> --- a/tests/qemu-iotests/170 >> +++ b/tests/qemu-iotests/170 >> @@ -23,7 +23,6 @@ owner=fullmanet@gmail.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 >> _cleanup() >> diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 >> index 910f18fd59..5b46069fde 100755 >> --- a/tests/qemu-iotests/171 >> +++ b/tests/qemu-iotests/171 >> @@ -25,7 +25,6 @@ owner=tgolembi@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 >> index 203554b30a..c5ee33ee81 100755 >> --- a/tests/qemu-iotests/172 >> +++ b/tests/qemu-iotests/172 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 >> index f657becd80..1fe8c5d738 100755 >> --- a/tests/qemu-iotests/173 >> +++ b/tests/qemu-iotests/173 >> @@ -24,7 +24,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 >> index bc8d6df3f6..d8bb05c4e2 100755 >> --- a/tests/qemu-iotests/174 >> +++ b/tests/qemu-iotests/174 >> @@ -24,7 +24,6 @@ owner=nirsof@gmail.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 >> index e3c904695d..ebbeb6e74c 100755 >> --- a/tests/qemu-iotests/175 >> +++ b/tests/qemu-iotests/175 >> @@ -24,7 +24,6 @@ owner=nirsof@gmail.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 >> index 32baa116dd..c091d0bd1e 100755 >> --- a/tests/qemu-iotests/176 >> +++ b/tests/qemu-iotests/176 >> @@ -29,7 +29,6 @@ owner=mreitz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 >> index dfd5723c8b..7bf8e1daf3 100755 >> --- a/tests/qemu-iotests/177 >> +++ b/tests/qemu-iotests/177 >> @@ -24,7 +24,6 @@ owner=eblake@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 >> index 5d25a50d03..3f4b4a4564 100755 >> --- a/tests/qemu-iotests/178 >> +++ b/tests/qemu-iotests/178 >> @@ -24,7 +24,6 @@ owner=stefanha@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179 >> index 115944a753..3040631636 100755 >> --- a/tests/qemu-iotests/179 >> +++ b/tests/qemu-iotests/179 >> @@ -24,7 +24,6 @@ owner=eblake@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 >> index c05318096a..0c44108dac 100755 >> --- a/tests/qemu-iotests/181 >> +++ b/tests/qemu-iotests/181 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> MIG_SOCKET="${TEST_DIR}/migrate" >> diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 >> index 4b31592fb8..9e0944d49a 100755 >> --- a/tests/qemu-iotests/182 >> +++ b/tests/qemu-iotests/182 >> @@ -24,7 +24,6 @@ owner=famz@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> tmp=/tmp/$$ >> status=1 # failure is the default! >> diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 >> index b28701302b..ebb5e304ac 100755 >> --- a/tests/qemu-iotests/183 >> +++ b/tests/qemu-iotests/183 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> MIG_SOCKET="${TEST_DIR}/migrate" >> diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 >> index a36a2e3270..2f3259d558 100755 >> --- a/tests/qemu-iotests/184 >> +++ b/tests/qemu-iotests/184 >> @@ -24,7 +24,6 @@ owner="Manos Pitsidianakis" >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> trap "exit \$status" 0 1 2 3 15 >> diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 >> index 80dca40465..d8f1505cd8 100755 >> --- a/tests/qemu-iotests/185 >> +++ b/tests/qemu-iotests/185 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 >> index ab71a30c14..29681bf45c 100755 >> --- a/tests/qemu-iotests/186 >> +++ b/tests/qemu-iotests/186 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 >> index 6affdc253c..1feddca508 100755 >> --- a/tests/qemu-iotests/187 >> +++ b/tests/qemu-iotests/187 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 >> index d946b9699d..af40e496ee 100755 >> --- a/tests/qemu-iotests/188 >> +++ b/tests/qemu-iotests/188 >> @@ -24,7 +24,6 @@ owner=berrange@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 >> index e98001fd99..222bec133b 100755 >> --- a/tests/qemu-iotests/189 >> +++ b/tests/qemu-iotests/189 >> @@ -24,7 +24,6 @@ owner=berrange@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 >> index fce04e2f3f..95ba06d8f4 100755 >> --- a/tests/qemu-iotests/190 >> +++ b/tests/qemu-iotests/190 >> @@ -24,7 +24,6 @@ owner=eblake@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 >> index 7de80df778..198272ea3b 100755 >> --- a/tests/qemu-iotests/191 >> +++ b/tests/qemu-iotests/191 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 >> index ee8fd2d841..415c706db5 100755 >> --- a/tests/qemu-iotests/192 >> +++ b/tests/qemu-iotests/192 >> @@ -25,7 +25,6 @@ owner=famz@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 >> index 7784b1f363..f56f255715 100755 >> --- a/tests/qemu-iotests/195 >> +++ b/tests/qemu-iotests/195 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 >> index 0369aa5cff..8170f5d4ab 100755 >> --- a/tests/qemu-iotests/197 >> +++ b/tests/qemu-iotests/197 >> @@ -24,7 +24,6 @@ owner=eblake@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> # get standard environment, filters and checks >> diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198 >> index c23bd16ea7..4d961f4f3a 100755 >> --- a/tests/qemu-iotests/198 >> +++ b/tests/qemu-iotests/198 >> @@ -24,7 +24,6 @@ owner=berrange@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 >> index 4f5d5b3b23..b9ebd5a8c7 100755 >> --- a/tests/qemu-iotests/200 >> +++ b/tests/qemu-iotests/200 >> @@ -26,7 +26,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/204 b/tests/qemu-iotests/204 >> index 0ec550a691..57f3afe1d7 100755 >> --- a/tests/qemu-iotests/204 >> +++ b/tests/qemu-iotests/204 >> @@ -24,7 +24,6 @@ owner=eblake@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 >> index c46ca2a6dd..7a2d5391bb 100755 >> --- a/tests/qemu-iotests/214 >> +++ b/tests/qemu-iotests/214 >> @@ -22,7 +22,6 @@ >> seq=$(basename "$0") >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215 >> index 2e616ed659..230fd2551a 100755 >> --- a/tests/qemu-iotests/215 >> +++ b/tests/qemu-iotests/215 >> @@ -21,7 +21,6 @@ >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> # get standard environment, filters and checks >> diff --git a/tests/qemu-iotests/221 b/tests/qemu-iotests/221 >> index 41c4e4bdf8..06f48f1f23 100755 >> --- a/tests/qemu-iotests/221 >> +++ b/tests/qemu-iotests/221 >> @@ -21,7 +21,6 @@ >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223 >> index 8b1859c2dd..58a3f3ff40 100755 >> --- a/tests/qemu-iotests/223 >> +++ b/tests/qemu-iotests/223 >> @@ -21,7 +21,6 @@ >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225 >> index f2ee715685..e42ee94ff0 100755 >> --- a/tests/qemu-iotests/225 >> +++ b/tests/qemu-iotests/225 >> @@ -24,7 +24,6 @@ owner=mreitz@redhat.com >> seq=$(basename $0) >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226 >> index c396edb6ab..aec413b23c 100755 >> --- a/tests/qemu-iotests/226 >> +++ b/tests/qemu-iotests/226 >> @@ -25,7 +25,6 @@ owner=jsnow@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227 >> index 9a5f7f9f14..43f2323ff2 100755 >> --- a/tests/qemu-iotests/227 >> +++ b/tests/qemu-iotests/227 >> @@ -24,7 +24,6 @@ owner=kwolf@redhat.com >> seq=$(basename $0) >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229 >> index ff851ec431..86602437ff 100755 >> --- a/tests/qemu-iotests/229 >> +++ b/tests/qemu-iotests/229 >> @@ -25,7 +25,6 @@ owner=jcody@redhat.com >> seq="$(basename $0)" >> echo "QA output created by $seq" >> -here="$PWD" >> status=1 # failure is the default! >> _cleanup() >> diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231 >> index e044cea9b5..e9f8aaacd3 100755 >> --- a/tests/qemu-iotests/231 >> +++ b/tests/qemu-iotests/231 >> @@ -26,7 +26,6 @@ owner=jcody@redhat.com >> seq=`basename $0` >> echo "QA output created by $seq" >> -here=$PWD >> status=1 # failure is the default! >> _cleanup() >> > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here 2018-10-24 23:26 ` Philippe Mathieu-Daudé 2018-10-25 9:34 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variablehere maozy @ 2018-11-16 16:49 ` Eric Blake 1 sibling, 0 replies; 11+ messages in thread From: Eric Blake @ 2018-11-16 16:49 UTC (permalink / raw) To: Philippe Mathieu-Daudé, Mao Zhongyi, qemu-devel, mreitz; +Cc: kwolf On 10/24/18 6:26 PM, Philippe Mathieu-Daudé wrote: > Hi Mao, > > On 24/10/18 11:40, Mao Zhongyi wrote: >> run >> git grep '\$here' tests/qemu-iotests Correct. You want both the \ and the $ to be handed to the grep regex. > > This command doesn't look correct, I believe you have to use either > > - git grep '$here' Nope - here, $ is unquoted to grep, so it matches end of line, and you can't match 'here' after end of line. > or > - git grep \$here Ditto. > >> >> has 0 hits, which means we are setting a variable that >> no use, so execute the following cmd to remove all of >> the 'here=...' lines as dead code. > > This seems to have been removed in e8f8624d3b920de. Worthwhile to mention in the commit message. > >> >> sed -i '/here=/d' $(git grep -l 'here=' tests/qemu-iotests) >> >> Cc: kwolf@redhat.com >> Cc: mreitz@redhat.com >> Cc: eblake@redhat.com >> >> Suggested-by: Eric Blake <eblake@redhat.com> > > Please Cc Eric if he suggested, so he can review. I was cc'd - but mailman is stupid and rewrites the cc line sent to the list because of my settings (I really wish it wouldn't). Reviewed-by: Eric Blake <eblake@redhat.com> I might just queue this through my NBD tree, since I noticed the issue again in test 233 just proposed by Dan. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org ^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH v2 3/3] qemu-iotests: Modern shell scripting (use $() instead of ``) 2018-10-24 9:40 [Qemu-devel] [PATCH v2 0/3] Do some cleaning work in qemu-iotests Mao Zhongyi 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD Mao Zhongyi 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here Mao Zhongyi @ 2018-10-24 9:40 ` Mao Zhongyi 2018-11-16 16:58 ` Eric Blake 2 siblings, 1 reply; 11+ messages in thread From: Mao Zhongyi @ 2018-10-24 9:40 UTC (permalink / raw) To: qemu-devel; +Cc: Mao Zhongyi, kwolf, mreitz, eblake Various shell files contain a mix between obsolete `` and modern $(); It would be nice to convert to using $() everywhere. Cc: kwolf@redhat.com Cc: mreitz@redhat.com Cc: eblake@redhat.com Suggested-by: Eric Blake <eblake@redhat.com> Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> --- tests/qemu-iotests/check | 60 ++++++++++++++++---------------- tests/qemu-iotests/common.config | 4 +-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index b37713277d..89ed275988 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -80,17 +80,17 @@ _full_imgfmt_details() _full_platform_details() { - os=`uname -s` - host=`hostname -s` - kernel=`uname -r` - platform=`uname -m` + os=$(uname -s) + host=$(hostname -s) + kernel=$(uname -r) + platform=$(uname -m) echo "$os/$platform $host $kernel" } # $1 = prog to look for set_prog_path() { - p=`command -v $1 2> /dev/null` + p=$(command -v $1 2> /dev/null) if [ -n "$p" -a -x "$p" ]; then type -p "$p" else @@ -147,9 +147,9 @@ do if $group then # arg after -g - group_list=`sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{ + group_list=$(sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{ s/ .*//p -}'` +}') if [ -z "$group_list" ] then echo "Group \"$r\" is empty or not defined?" @@ -173,9 +173,9 @@ s/ .*//p # arg after -x # Populate $tmp.list with all tests awk '/^[0-9]{3,}/ {print $1}' "${source_iotests}/group" > $tmp.list 2>/dev/null - group_list=`sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{ + group_list=$(sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{ s/ .*//p -}'` +}') if [ -z "$group_list" ] then echo "Group \"$r\" is empty or not defined?" @@ -193,7 +193,7 @@ s/ .*//p rm -f $tmp.sed fi echo "/^$t\$/d" >>$tmp.sed - numsed=`expr $numsed + 1` + numsed=$(expr $numsed + 1) done sed -f $tmp.sed <$tmp.list >$tmp.tmp mv $tmp.tmp $tmp.list @@ -433,12 +433,12 @@ testlist options ;; [0-9]*-[0-9]*) - eval `echo $r | sed -e 's/^/start=/' -e 's/-/ end=/'` + eval $(echo $r | sed -e 's/^/start=/' -e 's/-/ end=/') ;; [0-9]*-) - eval `echo $r | sed -e 's/^/start=/' -e 's/-//'` - end=`echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'` + eval $(echo $r | sed -e 's/^/start=/' -e 's/-//') + end=$(echo [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //') if [ -z "$end" ] then echo "No tests in range \"$r\"?" @@ -455,8 +455,8 @@ testlist options esac # get rid of leading 0s as can be interpreted as octal - start=`echo $start | sed 's/^0*//'` - end=`echo $end | sed 's/^0*//'` + start=$(echo $start | sed 's/^0*//') + end=$(echo $end | sed 's/^0*//') if $xpand then @@ -531,7 +531,7 @@ fi # should be sort -n, but this did not work for Linux when this # was ported from IRIX # -list=`sort $tmp.list` +list=$(sort $tmp.list) rm -f $tmp.list $tmp.tmp $tmp.sed if [ -z "$QEMU_PROG" ] @@ -590,7 +590,7 @@ fi export QEMU_NBD_PROG="$(type -p "$QEMU_NBD_PROG")" if [ -z "$QEMU_VXHS_PROG" ]; then - export QEMU_VXHS_PROG="`set_prog_path qnio_server`" + export QEMU_VXHS_PROG="$(set_prog_path qnio_server)" fi if [ -x "$build_iotests/socket_scm_helper" ] @@ -616,7 +616,7 @@ _wallclock() _timestamp() { - now=`date "+%T"` + now=$(date "+%T") printf %s " [$now]" } @@ -642,9 +642,9 @@ END { if (NR > 0) { if [ -f $tmp.expunged ] then - notrun=`wc -l <$tmp.expunged | sed -e 's/ *//g'` - try=`expr $try - $notrun` - list=`echo "$list" | sed -f $tmp.expunged` + notrun=$(wc -l <$tmp.expunged | sed -e 's/ *//g') + try=$(expr $try - $notrun) + list=$(echo "$list" | sed -f $tmp.expunged) fi echo "" >>check.log @@ -682,8 +682,8 @@ trap "_wrapup; exit \$status" 0 1 2 3 15 [ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE -FULL_IMGFMT_DETAILS=`_full_imgfmt_details` -FULL_HOST_DETAILS=`_full_platform_details` +FULL_IMGFMT_DETAILS=$(_full_imgfmt_details) +FULL_HOST_DETAILS=$(_full_platform_details) cat <<EOF QEMU -- "$QEMU_PROG" $QEMU_OPTIONS @@ -729,7 +729,7 @@ do # really going to try and run this one # rm -f $seq.out.bad - lasttime=`sed -n -e "/^$seq /s/.* //p" <$TIMESTAMP_FILE` + lasttime=$(sed -n -e "/^$seq /s/.* //p" <$TIMESTAMP_FILE) if [ "X$lasttime" != X ]; then printf %s " ${lasttime}s ..." else @@ -737,7 +737,7 @@ do fi rm -f core $seq.notrun - start=`_wallclock` + start=$(_wallclock) $timestamp && printf %s " [$(date "+%T")]" if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python" ]; then @@ -757,7 +757,7 @@ do fi sts=$? $timestamp && _timestamp - stop=`_wallclock` + stop=$(_wallclock) if [ -f core ] then @@ -806,7 +806,7 @@ do then : else - echo "$seq `expr $stop - $start`" >>$tmp.time + echo "$seq $(expr $stop - $start)" >>$tmp.time fi else echo " - output mismatch (see $seq.out.bad)" @@ -824,14 +824,14 @@ do if $err then bad="$bad $seq" - n_bad=`expr $n_bad + 1` + n_bad=$(expr $n_bad + 1) quick=false fi - [ -f $seq.notrun ] || try=`expr $try + 1` + [ -f $seq.notrun ] || try=$(expr $try + 1) seq="after_$seq" done interrupt=false -status=`expr $n_bad` +status=$(expr $n_bad) exit diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index d4721ba92d..74d1851865 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -21,8 +21,8 @@ export LANG=C PATH=".:$PATH" -HOSTOS=`uname -s` -arch=`uname -m` +HOSTOS=$(uname -s) +arch=$(uname -m) [[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch" export PWD=$PWD -- 2.17.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2 3/3] qemu-iotests: Modern shell scripting (use $() instead of ``) 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 3/3] qemu-iotests: Modern shell scripting (use $() instead of ``) Mao Zhongyi @ 2018-11-16 16:58 ` Eric Blake 0 siblings, 0 replies; 11+ messages in thread From: Eric Blake @ 2018-11-16 16:58 UTC (permalink / raw) To: Mao Zhongyi, qemu-devel; +Cc: kwolf, mreitz On 10/24/18 4:40 AM, Mao Zhongyi wrote: > Various shell files contain a mix between obsolete `` > and modern $(); It would be nice to convert to using > $() everywhere. > > Cc: kwolf@redhat.com > Cc: mreitz@redhat.com > Cc: eblake@redhat.com > > Suggested-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> > --- > tests/qemu-iotests/check | 60 ++++++++++++++++---------------- > tests/qemu-iotests/common.config | 4 +-- > 2 files changed, 32 insertions(+), 32 deletions(-) Only affects tests/ so safe for 3.1. I'm happy to take this through my NBD queue, since Dan's test addition will also be impacted by this change. > > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check > index b37713277d..89ed275988 100755 > --- a/tests/qemu-iotests/check > +++ b/tests/qemu-iotests/check > @@ -590,7 +590,7 @@ fi > export QEMU_NBD_PROG="$(type -p "$QEMU_NBD_PROG")" > > if [ -z "$QEMU_VXHS_PROG" ]; then > - export QEMU_VXHS_PROG="`set_prog_path qnio_server`" > + export QEMU_VXHS_PROG="$(set_prog_path qnio_server)" > fi Interesting indentation change while at it. But 4 spaces does seem to be more consistent. Reviewed-by: Eric Blake <eblake@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-11-16 20:46 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-10-24 9:40 [Qemu-devel] [PATCH v2 0/3] Do some cleaning work in qemu-iotests Mao Zhongyi 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 1/3] qemu-iotests: convert `pwd` and $(pwd) to $PWD Mao Zhongyi 2018-11-16 16:53 ` Eric Blake 2018-11-16 20:42 ` Eric Blake 2018-11-16 20:46 ` Eric Blake 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here Mao Zhongyi 2018-10-24 23:26 ` Philippe Mathieu-Daudé 2018-10-25 9:34 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variablehere maozy 2018-11-16 16:49 ` [Qemu-devel] [PATCH v2 2/3] qemu-iotests: remove unused variable here Eric Blake 2018-10-24 9:40 ` [Qemu-devel] [PATCH v2 3/3] qemu-iotests: Modern shell scripting (use $() instead of ``) Mao Zhongyi 2018-11-16 16:58 ` Eric Blake
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).