To follow uppercase letter guide of environment variables, rename
use_rxe to USE_RXE.
Reviewed-by: Daniel Wagner <dwagner@xxxxxxx>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@xxxxxxx>
---
Documentation/running-tests.md | 6 ++++--
common/multipath-over-rdma | 5 +++--
tests/nvme/rc | 2 +-
tests/srp/rc | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Documentation/running-tests.md b/Documentation/running-tests.md
index 7bd0885..968702e 100644
--- a/Documentation/running-tests.md
+++ b/Documentation/running-tests.md
@@ -132,9 +132,11 @@ NVMET_TRTYPES=rdma ./check nvme/
./check srp/
To use the rdma_rxe driver:
-use_rxe=1 NVMET_TRTYPES=rdma ./check nvme/
-use_rxe=1 ./check srp/
+USE_RXE=1 NVMET_TRTYPES=rdma ./check nvme/
+USE_RXE=1 ./check srp/
```
+'USE_RXE' had the old name 'use_rxe'. The old name is still usable but not
+recommended.
### Normal user
diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma
index ee05100..d0f4d26 100644
--- a/common/multipath-over-rdma
+++ b/common/multipath-over-rdma
@@ -12,12 +12,13 @@ filesystem_type=ext4
fio_aux_path=/tmp/fio-state-files
memtotal=$(sed -n 's/^MemTotal:[[:blank:]]*\([0-9]*\)[[:blank:]]*kB$/\1/p' /proc/meminfo)
max_ramdisk_size=$((1<<25))
-use_rxe=${use_rxe:-""}
ramdisk_size=$((memtotal*(1024/16))) # in bytes
if [ $ramdisk_size -gt $max_ramdisk_size ]; then
ramdisk_size=$max_ramdisk_size
fi
+_check_conflict_and_set_default USE_RXE use_rxe ""
+
_have_legacy_dm() {
_have_kernel_config_file || return
if ! _check_kernel_option DM_MQ_DEFAULT; then
@@ -396,7 +397,7 @@ start_soft_rdma() {
local type
{
- if [ -z "$use_rxe" ]; then
+ if [ -z "$USE_RXE" ]; then
modprobe siw || return $?
type=siw
else
diff --git a/tests/nvme/rc b/tests/nvme/rc
index 6fc0020..c1ddf41 100644
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -97,7 +97,7 @@ _nvme_requires() {
_have_driver nvmet-rdma
_have_configfs
_have_program rdma
- if [ -n "$use_rxe" ]; then
+ if [ -n "$USE_RXE" ]; then
_have_driver rdma_rxe
else
_have_driver siw
diff --git a/tests/srp/rc b/tests/srp/rc
index c77ef6c..85bd1dd 100755
--- a/tests/srp/rc
+++ b/tests/srp/rc
@@ -51,7 +51,7 @@ group_requires() {
_have_module ib_uverbs
_have_module null_blk
_have_module rdma_cm
- if [ -n "$use_rxe" ]; then
+ if [ -n "$USE_RXE" ]; then
_have_module rdma_rxe
else
_have_module siw
--
2.44.0
