diff mbox series

[v3,04/10] iotests/check: move QEMU_VXHS_PROG to common.rc

Message ID 20200421073601.28710-5-vsementsov@virtuozzo.com
State New
Headers show
Series None | expand

Commit Message

Vladimir Sementsov-Ogievskiy April 21, 2020, 7:35 a.m. UTC 
QEMU_VXHS_PROG is used only in common.rc. So, move it to common.rc,
simplifying a bit further conversion of check into python

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 tests/qemu-iotests/check     | 15 ---------------
 tests/qemu-iotests/common.rc | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)
diff mbox series

Patch

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index f7a2d3d6c3..03016e1e91 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -103,17 +103,6 @@  SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER
 EOF
 }
 
-# $1 = prog to look for
-set_prog_path()
-{
-    p=$(command -v $1 2> /dev/null)
-    if [ -n "$p" -a -x "$p" ]; then
-        type -p "$p"
-    else
-        return 1
-    fi
-}
-
 if [ -z "$TEST_DIR" ]; then
         TEST_DIR=$PWD/scratch
 fi
@@ -643,10 +632,6 @@  if [ -z $QEMU_NBD_PROG ]; then
 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)"
-fi
-
 if [ -x "$build_iotests/socket_scm_helper" ]
 then
     export SOCKET_SCM_HELPER="$build_iotests/socket_scm_helper"
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index bf3b9fdea0..aaab17c718 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -109,6 +109,16 @@  peek_file_raw()
     dd if="$1" bs=1 skip="$2" count="$3" status=none
 }
 
+# $1 = prog to look for
+set_prog_path()
+{
+    p=$(command -v $1 2> /dev/null)
+    if [ -n "$p" -a -x "$p" ]; then
+        type -p "$p"
+    else
+        return 1
+    fi
+}
 
 if ! . ./common.config
     then
@@ -116,6 +126,10 @@  if ! . ./common.config
     exit 1
 fi
 
+if [ -z "$QEMU_VXHS_PROG" ]; then
+    QEMU_VXHS_PROG="$(set_prog_path qnio_server)"
+fi
+
 # Set the variables to the empty string to turn Valgrind off
 # for specific processes, e.g.
 # $ VALGRIND_QEMU_IO= ./check -qcow2 -valgrind 015