From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH v4 03/12] test: Actually run cleanup function
Date: Fri, 09 Sep 2022 13:30:19 +1000 [thread overview]
Message-ID: <20220909033028.570161-4-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20220909033028.570161-1-david@gibson.dropbear.id.au>
[-- Attachment #1: Type: text/plain, Size: 911 bytes --]
We install a cleanup() function with 'trap' in order to clean up temporary
files we generate during the tests. However, we deinstall it after
run_term, which means it won't run in most of the cases where it would be
useful. Even if "run from_term" exits with an error, that error will be
hidden from the run_term wrapper because it's within a tmux session, so we
will return from run_term normally, uninstall the trap and never clean up.
In fact there's no reason to uninstall the trap at all, it works just as
well on the success exit path as an error exit path.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
test/run | 1 -
1 file changed, 1 deletion(-)
diff --git a/test/run b/test/run
index d8b60bf..9b0227b 100755
--- a/test/run
+++ b/test/run
@@ -178,7 +178,6 @@ else
:> "${LOGFILE}"
trap "cleanup" EXIT
run_term
- trap "" EXIT
fi
[ ${DEMO} -eq 1 ] && exit 0
--
@@ -178,7 +178,6 @@ else
:> "${LOGFILE}"
trap "cleanup" EXIT
run_term
- trap "" EXIT
fi
[ ${DEMO} -eq 1 ] && exit 0
--
2.37.3
next prev parent reply other threads:[~2022-09-09 3:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 3:30 [PATCH v4 00/12] Improve handling of test temporary files David Gibson
2022-09-09 3:30 ` [PATCH v4 01/12] test: Group tests by context then protocol, rather than the reverse David Gibson
2022-09-09 3:30 ` [PATCH v4 02/12] test: Remove unused variable FFMPEG_PID_FILE David Gibson
2022-09-09 3:30 ` David Gibson [this message]
2022-09-09 3:30 ` [PATCH v4 04/12] test: Create common state directories for temporary files David Gibson
2022-09-09 3:30 ` [PATCH v4 05/12] test: Move passt_test_log_pipe to state directory David Gibson
2022-09-09 3:30 ` [PATCH v4 06/12] test: Move context temporary files to state dir David Gibson
2022-09-09 3:30 ` [PATCH v4 07/12] test: Dont regnerate small test file in pasta/tcp David Gibson
2022-09-09 3:30 ` [PATCH v4 08/12] test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives David Gibson
2022-09-09 15:00 ` Stefano Brivio
2022-09-10 7:44 ` David Gibson
2022-09-10 20:41 ` Stefano Brivio
2022-09-09 3:30 ` [PATCH v4 09/12] test: Move pause temporary file to state directory David Gibson
2022-09-09 3:30 ` [PATCH v4 10/12] test: Store pcap files in $LOGDIR instead of /tmp David Gibson
2022-09-09 3:30 ` [PATCH v4 11/12] test: Move pidfiles and nsholder sockets into state directory David Gibson
2022-09-09 3:30 ` [PATCH v4 12/12] test: Move video processing files to $STATEBASE David Gibson
2022-09-09 15:00 ` Stefano Brivio
2022-09-10 7:45 ` David Gibson
2022-09-10 20:41 ` Stefano Brivio
2022-09-13 4:41 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220909033028.570161-4-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).