[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/12] qemu-iotests: convert `pwd` and $(pwd) to $PWD
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 02/12] qemu-iotests: convert `pwd` and $(pwd) to $PWD |
Date: |
Mon, 19 Nov 2018 11:54:17 -0600 |
From: Mao Zhongyi <address@hidden>
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: address@hidden
Cc: address@hidden
Cc: address@hidden
Suggested-by: Eric Blake <address@hidden>
Signed-off-by: Mao Zhongyi <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[eblake: touch up commit message, reorder series, tweak a couple more files]
Signed-off-by: Eric Blake <address@hidden>
---
configure | 2 +-
tests/qemu-iotests/common.config | 2 --
tests/qemu-iotests/common.rc | 2 +-
scripts/coccinelle/tcg_gen_extract.cocci | 2 +-
tests/check-block.sh | 6 +++---
tests/qemu-iotests/check | 2 +-
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 5b1d83ea262..0a3c6a72c3b 100755
--- a/configure
+++ b/configure
@@ -878,7 +878,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"
libudev="yes"
;;
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index 102aa6878a9..3cda0fe5696 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -25,8 +25,6 @@ HOSTOS=`uname -s`
arch=`uname -m`
[[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch"
-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 70ca65b49b3..e15e7a7c8e6 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}"
diff --git a/scripts/coccinelle/tcg_gen_extract.cocci
b/scripts/coccinelle/tcg_gen_extract.cocci
index 81e66a35ae1..c10c8634827 100644
--- a/scripts/coccinelle/tcg_gen_extract.cocci
+++ b/scripts/coccinelle/tcg_gen_extract.cocci
@@ -17,7 +17,7 @@
// --keep-comments --in-place \
// --use-gitgrep --dir target
//
-// $ docker run --rm -v `pwd`:`pwd` -w `pwd` philmd/coccinelle \
+// $ docker run --rm -v $PWD:$PWD -w $PWD philmd/coccinelle \
// --macro-file scripts/cocci-macro-file.h \
// --sp-file scripts/coccinelle/tcg_gen_extract.cocci \
// --keep-comments --in-place \
diff --git a/tests/check-block.sh b/tests/check-block.sh
index c3de3789c48..f3d12fd602d 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/check b/tests/qemu-iotests/check
index aa94c6c7ea9..b37713277d1 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
--
2.17.2
- [Qemu-devel] [PULL 00/12] NBD patches for 3.1-rc2, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 02/12] qemu-iotests: convert `pwd` and $(pwd) to $PWD,
Eric Blake <=
- [Qemu-devel] [PULL 04/12] nbd: fix whitespace in server error message, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 06/12] io: return 0 for EOF in TLS session read after shutdown, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 03/12] qemu-iotests: Modern shell scripting (use $() instead of ``), Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 05/12] nbd/server: Ignore write errors when replying to NBD_OPT_ABORT, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 09/12] tests: add iotests helpers for dealing with TLS certificates, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 08/12] tests: check if qemu-nbd is still alive before waiting, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 07/12] tests: pull qemu-nbd iotest helpers into common.nbd file, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 11/12] iotests: Also test I/O over NBD TLS, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 10/12] tests: exercise NBD server in TLS mode, Eric Blake, 2018/11/19
- [Qemu-devel] [PULL 12/12] iotests: Drop use of bash keyword 'function', Eric Blake, 2018/11/19