From 3dad8b15686a67e23069a880b6e58ab69da28d86 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 21 Aug 2019 16:02:26 -0700 Subject: [PATCH] test/fuzz: remove shm file during cleanup. In the event that our fuzz test passes, we should manually remove the trace files from the /dev/shm directory. This will prevent us from failing to allocate /dev/shm files when a machine consistently passes the tests and doesn't reboot. Change-Id: I2ccde6aba7d61fda3a28ed24e009c6f8f81c20b4 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465996 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- scripts/setup.sh | 3 ++- test/vhost/fuzz/fuzz.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index b00df8049..68151c5ac 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -307,7 +307,8 @@ function cleanup_linux { done shopt -u extglob nullglob - files_to_clean+="$(ls -1 /dev/shm/* | grep -E '(spdk_tgt|iscsi|vhost|nvmf|rocksdb|bdevio|bdevperf)_trace|spdk_iscsi_conns' || true) " + files_to_clean+="$(ls -1 /dev/shm/* | \ + grep -E '(spdk_tgt|iscsi|vhost|nvmf|rocksdb|bdevio|bdevperf|vhost_fuzz|nvme_fuzz)_trace|spdk_iscsi_conns' || true) " files_to_clean="$(readlink -e assert_not_empty $files_to_clean || true)" if [[ -z "$files_to_clean" ]]; then echo "Clean" diff --git a/test/vhost/fuzz/fuzz.sh b/test/vhost/fuzz/fuzz.sh index 7174e3bcc..21d36a503 100755 --- a/test/vhost/fuzz/fuzz.sh +++ b/test/vhost/fuzz/fuzz.sh @@ -67,4 +67,5 @@ trap - SIGINT SIGTERM exit killprocess $vhostpid killprocess $fuzzpid + timing_exit fuzz_test