nvmeof-mp/001: Set expected count properly

The number of block devices will increase according
to the number of RDMA-capable NICs.
For example, nvmeof-mp/001 with two RDMA-capable NICs
got the following error:
-------------------------------------
    Configured NVMe target driver
    -count_devices(): 1 <> 1
    +count_devices(): 2 <> 1
    Passed
-------------------------------------

Set expected count properly by calculating the number
of RDMA-capable NICs.

Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com>
Reviewed-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvmeof-mp/001 b/tests/nvmeof-mp/001
index f3e63945e43f2992f43d58925b0c466a6269437e..70a4455808cb3710726b0e13131121a4ee25580a 100755 (executable)
--- a/tests/nvmeof-mp/001
+++ b/tests/nvmeof-mp/001
@@ -18,17 +18,20 @@ count_devices() {
 }
 
 wait_for_devices() {
-       local expected=1 i devices
+       local expected=0 i devices
+
+       for i in $(rdma_network_interfaces); do
+               ((expected++))
+       done
 
        use_blk_mq y || return $?
        for ((i=0;i<100;i++)); do
                devices=$(count_devices)
-               [ "$devices" -ge $expected ] && break
+               [ "$devices" -ge "$expected" ] && break
                sleep .1
        done
        echo "count_devices(): $devices <> $expected" >>"$FULL"
-       echo "count_devices(): $devices <> $expected"
-       [ "$devices" -ge $expected ]
+       [ "$devices" -ge "$expected" ]
 }
 
 test() {

diff --git a/tests/nvmeof-mp/001.out b/tests/nvmeof-mp/001.out
index 2ce8d1700ec4ed49d4abb2774968ad67a0a91fc9..a7d4cb9bcb29e8d4f866ddd7f4b20059bc0a0065 100644 (file)
--- a/tests/nvmeof-mp/001.out
+++ b/tests/nvmeof-mp/001.out
@@ -1,3 +1,2 @@
 Configured NVMe target driver
-count_devices(): 1 <> 1
 Passed