Commit fb9c4ee6 authored by Karol Latecki's avatar Karol Latecki Committed by Darek Stojaczyk
Browse files

test: replace backticks with dollar-parenthesis syntax 



Scripts were using a mix of two approaches, lets unify that so
just dollar-parenthesis syntax is used.

Change-Id: Id093b6c82d1f766ba6af13bed720977eceaa7ffc
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457744


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent ffc26bc3

test/bdev/blockdev.sh

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ function nbd_function_test() { 
		local rpc_server=/var/tmp/spdk-nbd.sock

		local conf=$1

		local nbd_num=6

		local nbd_all=(`ls /dev/nbd* | grep -v p`)

		local nbd_all=($(ls /dev/nbd* | grep -v p))

		local bdev_all=($bdevs_name)

		local nbd_list=(${nbd_all[@]:0:$nbd_num})

		local bdev_list=(${bdev_all[@]:0:$nbd_num})

test/bdev/nbd_common.sh

+5 −5
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ function nbd_get_count() { 
	# return = count of spdk nbd devices

	local rpc_server=$1



	nbd_disks_json=`$rootdir/scripts/rpc.py -s $rpc_server get_nbd_disks`

	nbd_disks_name=`echo "${nbd_disks_json}" | jq -r '.[] | .nbd_device'`

	count=`echo "${nbd_disks_name}" | grep -c /dev/nbd || true`

	nbd_disks_json=$($rootdir/scripts/rpc.py -s $rpc_server get_nbd_disks)

	nbd_disks_name=$(echo "${nbd_disks_json}" | jq -r '.[] | .nbd_device')

	count=$(echo "${nbd_disks_name}" | grep -c /dev/nbd || true)

	echo $count

}
@@ -110,8 +110,8 @@ function nbd_rpc_start_stop_verify() { 


	nbd_start_disks_without_nbd_idx $rpc_server "${bdev_list[*]}"



	nbd_disks_json=`$rootdir/scripts/rpc.py -s $rpc_server get_nbd_disks`

	nbd_disks_name=(`echo "${nbd_disks_json}" | jq -r '.[] | .nbd_device'`)

	nbd_disks_json=$($rootdir/scripts/rpc.py -s $rpc_server get_nbd_disks)

	nbd_disks_name=($(echo "${nbd_disks_json}" | jq -r '.[] | .nbd_device'))

	nbd_stop_disks $rpc_server "${nbd_disks_name[*]}"



	count=$(nbd_get_count $rpc_server)

test/blobfs/rocksdb/run_tests.sh

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ if ls $TESTDIR/results/testrun_* &> /dev/null; then 
fi



if [ -z "$RESULTS_DIR" ]; then

	RESULTS_DIR=$TESTDIR/results/testrun_`date +%Y%m%d_%H%M%S`

	RESULTS_DIR=$TESTDIR/results/testrun_$(date +%Y%m%d_%H%M%S)

	mkdir -p $RESULTS_DIR

	rm -f $TESTDIR/results/last

	ln -s $RESULTS_DIR $TESTDIR/results/last
@@ -157,7 +157,7 @@ run_step() { 
		echo -n Generating perf report for $1 test phase...

		sudo perf report -f -n | sed '/#/d' | sed '/%/!d' | sort -r > $1.perf.txt

		sudo rm perf.data

		$TESTDIR/postprocess.py `pwd` $1 > $1_summary.txt

		$TESTDIR/postprocess.py $(pwd) $1 > $1_summary.txt

	echo done.

	fi

}

test/blobstore/blob_io_wait/blob_io_wait.sh

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash



SYSTEM=`uname -s`

SYSTEM=$(uname -s)

if [ $SYSTEM = "FreeBSD" ] ; then

    echo "blob_io_wait.sh cannot run on FreeBSD currently."

    exit 0

test/blobstore/blobstore.sh

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash



SYSTEM=`uname -s`

SYSTEM=$(uname -s)

if [ $SYSTEM = "FreeBSD" ] ; then

    echo "blobstore.sh cannot run on FreeBSD currently."

    exit 0