From 266772ded967cb9e6512554e45184c21e7e35883 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Fri, 10 May 2019 11:39:08 -0700 Subject: [PATCH] vhost: Remove work-dir parameter to test scripts This wasn't used in the automated tests. It's probably only for manual testing. For manual testing we're moving to a model where the test script can run with just the 'iso' option, so let's drop this parameter to simplify. Change-Id: Iaafd237bcd4185844e568e79828824bdaf31a25d Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454093 Reviewed-by: Paul Luse Reviewed-by: Pawel Kaminski Reviewed-by: Darek Stojaczyk Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- test/vhost/fiotest/fio.sh | 2 -- test/vhost/integrity/integrity_start.sh | 1 - test/vhost/migration/migration-tc3a.sh | 2 +- test/vhost/migration/migration.sh | 2 -- test/vhost/other/negative.sh | 4 +--- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/test/vhost/fiotest/fio.sh b/test/vhost/fiotest/fio.sh index 07e0c54e0..8713cef36 100755 --- a/test/vhost/fiotest/fio.sh +++ b/test/vhost/fiotest/fio.sh @@ -32,7 +32,6 @@ function usage() echo " --fio-job= Fio config to use for test." echo " All VMs will run the same fio job when FIO executes." echo " (no unique jobs for specific VMs)" - echo " --work-dir=WORK_DIR Where to find build file. Must exist. [default: $TEST_DIR]" echo " --dry-run Don't perform any tests, run only and wait for enter to terminate" echo " --no-shutdown Don't shutdown at the end but leave envirionment working" echo " --vm=NUM[,OS][,DISKS] VM configuration. This parameter might be used more than once:" @@ -49,7 +48,6 @@ while getopts 'xh-:' optchar; do -) case "$OPTARG" in help) usage $0 ;; - work-dir=*) TEST_DIR="${OPTARG#*=}" ;; fio-bin=*) fio_bin="--fio-bin=${OPTARG#*=}" ;; fio-job=*) fio_job="${OPTARG#*=}" ;; dry-run) dry_run=true ;; diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index 641c4aecc..bff047466 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -12,7 +12,6 @@ function usage() echo "Usage: $(basename $1) [OPTIONS]" echo echo "-h, --help Print help and exit" - echo " --work-dir=WORK_DIR Workspace for the test to run" echo " --ctrl-type=TYPE Controller type to use for test:" echo " spdk_vhost_scsi - use spdk vhost scsi" echo " --fs=FS_LIST Filesystems to use for test in VM:" diff --git a/test/vhost/migration/migration-tc3a.sh b/test/vhost/migration/migration-tc3a.sh index 0f20b9948..4af93f34b 100644 --- a/test/vhost/migration/migration-tc3a.sh +++ b/test/vhost/migration/migration-tc3a.sh @@ -178,7 +178,7 @@ function host_2_create_share() function host_2_start_vhost() { ssh_remote $MGMT_INITIATOR_IP "nohup $spdk_repo_share_dir/spdk/test/vhost/migration/migration.sh\ - --test-cases=3b --work-dir=$TEST_DIR --os=$share_dir/migration.qcow2\ + --test-cases=3b --os=$share_dir/migration.qcow2\ --rdma-tgt-ip=$RDMA_TARGET_IP &>$share_dir/output.log &" notice "Waiting for remote to be done with vhost & VM setup..." wait_for_remote diff --git a/test/vhost/migration/migration.sh b/test/vhost/migration/migration.sh index 28e1f721e..d822a30a9 100755 --- a/test/vhost/migration/migration.sh +++ b/test/vhost/migration/migration.sh @@ -21,7 +21,6 @@ function usage() echo "Shortcut script for doing automated test of live migration." echo "Usage: $(basename $1) [OPTIONS]" echo - echo " --work-dir=WORK_DIR Where to find build file. Must exist. [default: $TEST_DIR]" echo " --os ARGS VM configuration. This parameter might be used more than once:" echo " --fio-bin=FIO Use specific fio binary (will be uploaded to VM)" echo " --test-cases=TESTS Coma-separated list of tests to run. Implemented test cases are: 1" @@ -39,7 +38,6 @@ for param in "$@"; do usage $0 exit 0 ;; - --work-dir=*) TEST_DIR="${param#*=}" ;; --os=*) os_image="${param#*=}" ;; --fio-bin=*) fio_bin="${param}" ;; --test-cases=*) test_cases="${param#*=}" ;; diff --git a/test/vhost/other/negative.sh b/test/vhost/other/negative.sh index 17f8e626c..800333179 100755 --- a/test/vhost/other/negative.sh +++ b/test/vhost/other/negative.sh @@ -8,10 +8,9 @@ function usage() { [[ ! -z $2 ]] && ( echo "$2"; echo ""; ) echo "Shortcut script for running vhost app." - echo "Usage: $(basename $1) [-x] [-h|--help] [--clean-build] [--work-dir=PATH]" + echo "Usage: $(basename $1) [-x] [-h|--help] [--clean-build]" echo "-h, --help print help and exit" echo "-x Set -x for script debug" - echo " --work-dir=PATH Where to find source/project. [default=$TEST_DIR]" exit 0 } @@ -22,7 +21,6 @@ while getopts 'xh-:' optchar; do -) case "$OPTARG" in help) usage $0 ;; - work-dir=*) TEST_DIR="${OPTARG#*=}" ;; conf-dir=*) CONF_DIR="${OPTARG#*=}" ;; *) usage $0 echo "Invalid argument '$OPTARG'" ;; esac