test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives
Instead of using the 'temp' and 'tempdir' DSL directives to create temporary files, use fixed paths relative to __STATEDIR__. This has two advantages: 1) The files are automatically cleaned up if the tests fail (and even if that doesn't work they're easier to clean up manuall) 2) When debugging tests it's easier to figure out which of the temporary files are relevant to whatever's going wrong Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:

committed by
Stefano Brivio

parent
c71a5e8528
commit
1c36c8d3f8
@@ -99,16 +99,6 @@ test_one_line() {
|
||||
IFS= eval TEST_ONE_DEF_$TEST_ONE_in_def=
|
||||
IFS="${__ifs}"
|
||||
;;
|
||||
"tempdir")
|
||||
__tmpdir="$(mktemp -d)"
|
||||
TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__arg}__" "${__tmpdir}")"
|
||||
TEST_ONE_dirclean="$(list_add "${TEST_ONE_dirclean}" "${__tmpdir}")"
|
||||
;;
|
||||
"temp")
|
||||
__tmpfile="$(mktemp)"
|
||||
TEST_ONE_subs="$(list_add_pair "${TEST_ONE_subs}" "__${__arg}__" "${__tmpfile}")"
|
||||
TEST_ONE_dirclean="$(list_add "${TEST_ONE_dirclean}" "${__tmpfile}")"
|
||||
;;
|
||||
"test")
|
||||
[ ${TEST_ONE_perf_nok} -eq 0 ] || TEST_ONE_nok=1
|
||||
[ ${TEST_ONE_nok} -eq 1 ] && status_test_fail
|
||||
|
Reference in New Issue
Block a user