diff options
| author | Mao Zhongyi <maozhongyi@cmss.chinamobile.com> | 2018-11-16 14:33:03 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2018-11-19 10:08:19 -0600 |
| commit | e8d81a61e1b9e28267164f751dee5b9b59444e71 (patch) | |
| tree | 1086e80b29b3a17243fc4b527379d4a9a6b1aa31 /tests/check-block.sh | |
| parent | bf22957309369cf6f642e715ff6c470671920e7e (diff) | |
qemu-iotests: convert `pwd` and $(pwd) to $PWD
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 replace it with the following:
sed -i 's/\(`pwd`\|\$(pwd)\)/$PWD/g' $(git grep -l pwd)
Then delete a pointless line assigning PWD to itself.
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>
Message-Id: <20181024094051.4470-2-maozhongyi@cmss.chinamobile.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: touch up commit message, reorder series, tweak a couple more files]
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/check-block.sh')
| -rwxr-xr-x | tests/check-block.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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" |