Commit 46f60d43 authored by Pawel Niedzwiecki's avatar Pawel Niedzwiecki Committed by Jim Harris
Browse files

test/spdkcli: Add few changes 



- specify spdkcli tree branch for match test. Test only
specified branch
- move match files to subfolder to keep it organized

Change-Id: I7796ff13d38b2bfd500fd71442bcb6e6fa95df01
Signed-off-by: default avatarPawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/420517


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 5f9bdac0

test/spdkcli/common.sh

+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ spdkcli_job="python3 $SPDKCLI_BUILD_DIR/test/spdkcli/spdkcli_job.py" 
function on_error_exit() {

	set +e

	killprocess $spdk_tgt_pid

	rm -f $testdir/${MATCH_FILE} $testdir/spdkcli_details_vhost.test /tmp/sample_aio

	rm -f $testdir/${MATCH_FILE} $testdir/match_files/spdkcli_details_vhost.test /tmp/sample_aio

	print_backtrace

	exit 1

}
@@ -21,7 +21,7 @@ function run_spdk_tgt() { 
}



function check_match() {

	python3 $SPDKCLI_BUILD_DIR/scripts/spdkcli.py ll > $testdir/${MATCH_FILE}

	$SPDKCLI_BUILD_DIR/test/app/match/match -v $testdir/${MATCH_FILE}.match

	rm -f $testdir/${MATCH_FILE}

	python3 $SPDKCLI_BUILD_DIR/scripts/spdkcli.py ll $SPDKCLI_BRANCH > $testdir/match_files/${MATCH_FILE}

	$SPDKCLI_BUILD_DIR/test/app/match/match -v $testdir/match_files/${MATCH_FILE}.match

	rm -f $testdir/match_files/${MATCH_FILE}

}

test/spdkcli/match_files/spdkcli_rbd.test.match

0 → 100644
+2 −0
Original line number Diff line number Diff line 
o- rbd .................................................................................................................. [Bdevs: 1]

  o- Ceph0 ............................................................................................. [Size=1000.0M, Not claimed]

test/spdkcli/rbd.sh

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
set -xe



MATCH_FILE="spdkcli_rbd.test"

SPDKCLI_BRANCH="/bdevs/rbd"

testdir=$(readlink -f $(dirname $0))

. $testdir/common.sh