From 9c659fb125b602932b3c3ce2cccfb9da0e4477b5 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 16 Jan 2020 17:02:36 -0700 Subject: [PATCH] test/fuzz fix end of test behavior. The fuzz jobs should fail if the nvmf or vhost target crashed while they were running. Otherwise they should pass. Some recent changes to the way killprocess and nvmftestfini work were causing this to break. This change fixes that. Change-Id: Id14fd47c2d8c7d91358c5e8a69e53ec4cf33ddce Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/481911 Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Community-CI: SPDK CI Jenkins --- test/fuzz/autofuzz_nvmf.sh | 2 -- test/fuzz/autofuzz_vhost.sh | 4 ---- 2 files changed, 6 deletions(-) diff --git a/test/fuzz/autofuzz_nvmf.sh b/test/fuzz/autofuzz_nvmf.sh index c3fd7fc62..501651640 100755 --- a/test/fuzz/autofuzz_nvmf.sh +++ b/test/fuzz/autofuzz_nvmf.sh @@ -47,7 +47,5 @@ $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1 trap - SIGINT SIGTERM EXIT nvmfcleanup -killprocess $nvmfpid - nvmftestfini timing_exit nvmf_fuzz_test diff --git a/test/fuzz/autofuzz_vhost.sh b/test/fuzz/autofuzz_vhost.sh index e72ece9f5..963004116 100755 --- a/test/fuzz/autofuzz_vhost.sh +++ b/test/fuzz/autofuzz_vhost.sh @@ -70,9 +70,5 @@ $fuzz_generic_rpc_py framework_start_init wait $fuzzpid trap - SIGINT SIGTERM exit -set +e killprocess $vhostpid -echo $? -set -e -killprocess $fuzzpid timing_exit vhost_fuzz_test