From ee7cdc2c762555f1ca3f8b36ef18855f999631f9 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 21 Feb 2020 09:22:58 +0100 Subject: [PATCH] test/fuzz: Rename FUZZ_APP to VHOST_FUZZ_UP Since there's more than one fuzz app covering different areas, rename FUZZ_UP to VHOST_FUZZ_UP to make the type of the app clear right off the bat. Change-Id: I7730f1e14895d9221ec76dea0f53b5054a97be1c Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/978 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Darek Stojaczyk --- test/common/applications.sh | 2 +- test/fuzz/autofuzz_vhost.sh | 4 ++-- test/vhost/fuzz/fuzz.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/common/applications.sh b/test/common/applications.sh index a038c5d95..6e472cf3e 100644 --- a/test/common/applications.sh +++ b/test/common/applications.sh @@ -5,7 +5,7 @@ _root=${_root%/test/common} _app_dir=$_root/app _test_app_dir=$_root/test/app -FUZZ_APP=("$_test_app_dir/fuzz/vhost_fuzz/vhost_fuzz") +VHOST_FUZZ_APP=("$_test_app_dir/fuzz/vhost_fuzz/vhost_fuzz") ISCSI_APP=("$_app_dir/iscsi_tgt/iscsi_tgt") NVMF_APP=("$_app_dir/nvmf_tgt/nvmf_tgt") VHOST_APP=("$_app_dir/vhost/vhost") diff --git a/test/fuzz/autofuzz_vhost.sh b/test/fuzz/autofuzz_vhost.sh index 36f6d02a3..0fd7aed71 100755 --- a/test/fuzz/autofuzz_vhost.sh +++ b/test/fuzz/autofuzz_vhost.sh @@ -8,7 +8,7 @@ TEST_TIMEOUT=1200 VHOST_APP+=(-p 0) FUZZ_RPC_SOCK="/var/tmp/spdk_fuzz.sock" -FUZZ_APP+=(-r "$FUZZ_RPC_SOCK" --wait-for-rpc) +VHOST_FUZZ_APP+=(-r "$FUZZ_RPC_SOCK" --wait-for-rpc) vhost_rpc_py="$rootdir/scripts/rpc.py" fuzz_generic_rpc_py="$rootdir/scripts/rpc.py -s $FUZZ_RPC_SOCK" @@ -35,7 +35,7 @@ waitforlisten $vhostpid trap 'killprocess $vhostpid; exit 1' SIGINT SIGTERM exit -"${FUZZ_APP[@]}" -t $TEST_TIMEOUT 2>"$output_dir/vhost_autofuzz_output1.txt" & +"${VHOST_FUZZ_APP[@]}" -t $TEST_TIMEOUT 2>"$output_dir/vhost_autofuzz_output1.txt" & fuzzpid=$! waitforlisten $fuzzpid $FUZZ_RPC_SOCK diff --git a/test/vhost/fuzz/fuzz.sh b/test/vhost/fuzz/fuzz.sh index 5a17c5fc9..7d1699e9b 100755 --- a/test/vhost/fuzz/fuzz.sh +++ b/test/vhost/fuzz/fuzz.sh @@ -7,7 +7,7 @@ source "$rootdir/scripts/common.sh" VHOST_APP+=(-p 0) FUZZ_RPC_SOCK="/var/tmp/spdk_fuzz.sock" -FUZZ_APP+=(-r "$FUZZ_RPC_SOCK" --wait-for-rpc) +VHOST_FUZZ_APP+=(-r "$FUZZ_RPC_SOCK" --wait-for-rpc) vhost_rpc_py="$rootdir/scripts/rpc.py" fuzz_generic_rpc_py="$rootdir/scripts/rpc.py -s $FUZZ_RPC_SOCK" @@ -19,7 +19,7 @@ waitforlisten $vhostpid trap 'killprocess $vhostpid; exit 1' SIGINT SIGTERM exit -"${FUZZ_APP[@]}" -t 10 2>"$output_dir/vhost_fuzz_output1.txt" & +"${VHOST_FUZZ_APP[@]}" -t 10 2>"$output_dir/vhost_fuzz_output1.txt" & fuzzpid=$! waitforlisten $fuzzpid $FUZZ_RPC_SOCK @@ -47,7 +47,7 @@ $fuzz_generic_rpc_py framework_start_init wait $fuzzpid -"${FUZZ_APP[@]}" -j "$rootdir/test/app/fuzz/vhost_fuzz/example.json" 2>"$output_dir/vhost_fuzz_output2.txt" & +"${VHOST_FUZZ_APP[@]}" -j "$rootdir/test/app/fuzz/vhost_fuzz/example.json" 2>"$output_dir/vhost_fuzz_output2.txt" & fuzzpid=$! waitforlisten $fuzzpid $FUZZ_RPC_SOCK