diff --git a/tests/generators/generate-luks2-area-in-json-hdr-space-json0.img.sh b/tests/generators/generate-luks2-area-in-json-hdr-space-json0.img.sh index 103eed05..1fac008f 100755 --- a/tests/generators/generate-luks2-area-in-json-hdr-space-json0.img.sh +++ b/tests/generators/generate-luks2-area-in-json-hdr-space-json0.img.sh @@ -46,13 +46,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-argon2-leftover-params.img.sh b/tests/generators/generate-luks2-argon2-leftover-params.img.sh index 47e80d63..f89d7063 100755 --- a/tests/generators/generate-luks2-argon2-leftover-params.img.sh +++ b/tests/generators/generate-luks2-argon2-leftover-params.img.sh @@ -45,13 +45,7 @@ function check() test $((obj_len+2)) -eq $new_obj_len || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-correct-full-json0.img.sh b/tests/generators/generate-luks2-correct-full-json0.img.sh index cf8b034f..fcc30cee 100755 --- a/tests/generators/generate-luks2-correct-full-json0.img.sh +++ b/tests/generators/generate-luks2-correct-full-json0.img.sh @@ -61,13 +61,7 @@ function check() test ${#json_str_res0} -eq $((LUKS2_JSON_SIZE*512-1)) || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-corrupted-hdr0-with-correct-chks.img.sh b/tests/generators/generate-luks2-corrupted-hdr0-with-correct-chks.img.sh index 87aafae0..aa5de5cf 100755 --- a/tests/generators/generate-luks2-corrupted-hdr0-with-correct-chks.img.sh +++ b/tests/generators/generate-luks2-corrupted-hdr0-with-correct-chks.img.sh @@ -40,13 +40,7 @@ function check() test ${#json_str_res0} -eq $((LUKS2_JSON_SIZE*512)) || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-corrupted-hdr1-with-correct-chks.img.sh b/tests/generators/generate-luks2-corrupted-hdr1-with-correct-chks.img.sh index a0d6c03f..e96cb810 100755 --- a/tests/generators/generate-luks2-corrupted-hdr1-with-correct-chks.img.sh +++ b/tests/generators/generate-luks2-corrupted-hdr1-with-correct-chks.img.sh @@ -41,13 +41,7 @@ function check() test ${#json_str_res1} -eq $((LUKS2_JSON_SIZE*512)) || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-checksum-both-hdrs.img.sh b/tests/generators/generate-luks2-invalid-checksum-both-hdrs.img.sh index 565616b8..330e0fde 100755 --- a/tests/generators/generate-luks2-invalid-checksum-both-hdrs.img.sh +++ b/tests/generators/generate-luks2-invalid-checksum-both-hdrs.img.sh @@ -28,13 +28,7 @@ function check() test "$chks1" = "$chks_res1" || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-checksum-hdr0.img.sh b/tests/generators/generate-luks2-invalid-checksum-hdr0.img.sh index 6836c12f..d5c4c489 100755 --- a/tests/generators/generate-luks2-invalid-checksum-hdr0.img.sh +++ b/tests/generators/generate-luks2-invalid-checksum-hdr0.img.sh @@ -23,13 +23,7 @@ function check() test "$chks" = "$chks_res" || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-checksum-hdr1.img.sh b/tests/generators/generate-luks2-invalid-checksum-hdr1.img.sh index ebc1cec4..58dfd619 100755 --- a/tests/generators/generate-luks2-invalid-checksum-hdr1.img.sh +++ b/tests/generators/generate-luks2-invalid-checksum-hdr1.img.sh @@ -24,13 +24,7 @@ function check() test "$chks" = "$chks_res" || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-json-size-c0.img.sh b/tests/generators/generate-luks2-invalid-json-size-c0.img.sh index 5685819a..76d3aaab 100755 --- a/tests/generators/generate-luks2-invalid-json-size-c0.img.sh +++ b/tests/generators/generate-luks2-invalid-json-size-c0.img.sh @@ -42,13 +42,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-json-size-c1.img.sh b/tests/generators/generate-luks2-invalid-json-size-c1.img.sh index 2b2d13b3..a9d8cba6 100755 --- a/tests/generators/generate-luks2-invalid-json-size-c1.img.sh +++ b/tests/generators/generate-luks2-invalid-json-size-c1.img.sh @@ -42,13 +42,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-json-size-c2.img.sh b/tests/generators/generate-luks2-invalid-json-size-c2.img.sh index 5f84735e..0d51f602 100755 --- a/tests/generators/generate-luks2-invalid-json-size-c2.img.sh +++ b/tests/generators/generate-luks2-invalid-json-size-c2.img.sh @@ -59,13 +59,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh b/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh index 19826dca..bb58e315 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c0.img.sh @@ -45,13 +45,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh b/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh index b70ae45c..1cceaeb2 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c1.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh b/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh index 20a290f2..611f4567 100755 --- a/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh +++ b/tests/generators/generate-luks2-invalid-keyslots-size-c2.img.sh @@ -42,13 +42,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-object-type-json0.img.sh b/tests/generators/generate-luks2-invalid-object-type-json0.img.sh index 4dfa2e48..49261afa 100755 --- a/tests/generators/generate-luks2-invalid-object-type-json0.img.sh +++ b/tests/generators/generate-luks2-invalid-object-type-json0.img.sh @@ -44,13 +44,7 @@ function check() test "$json_str" = "$json_str_res0" || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh b/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh index 196d948d..7ae51ffb 100755 --- a/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh +++ b/tests/generators/generate-luks2-invalid-opening-char-json0.img.sh @@ -44,13 +44,7 @@ function check() test "$json_str" = "$json_str_res0" || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-keyslot-missing-digest.img.sh b/tests/generators/generate-luks2-keyslot-missing-digest.img.sh index b2e16d45..5b2af64d 100755 --- a/tests/generators/generate-luks2-keyslot-missing-digest.img.sh +++ b/tests/generators/generate-luks2-keyslot-missing-digest.img.sh @@ -46,13 +46,7 @@ function check() test $((arr_len-1)) -eq $new_arr_len || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh b/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh index 2a4ffe14..7dcf944d 100755 --- a/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh +++ b/tests/generators/generate-luks2-keyslot-too-many-digests.img.sh @@ -44,13 +44,7 @@ function check() test 1 -eq $new_arr_len || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh index 00a11e4b..cb62edd7 100755 --- a/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-128k-secondary.img.sh @@ -71,13 +71,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-128k.img.sh b/tests/generators/generate-luks2-metadata-size-128k.img.sh index 6af1fca8..4c74c328 100755 --- a/tests/generators/generate-luks2-metadata-size-128k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-128k.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh index 948159ea..07350e72 100755 --- a/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-16k-secondary.img.sh @@ -71,13 +71,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh index 247c5066..49125175 100755 --- a/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-1m-secondary.img.sh @@ -71,13 +71,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-1m.img.sh b/tests/generators/generate-luks2-metadata-size-1m.img.sh index 03c70de5..d224b36f 100755 --- a/tests/generators/generate-luks2-metadata-size-1m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-1m.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh index 5ecbf081..8a9e4e88 100755 --- a/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-256k-secondary.img.sh @@ -71,13 +71,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-256k.img.sh b/tests/generators/generate-luks2-metadata-size-256k.img.sh index 0ca28a68..f918ee59 100755 --- a/tests/generators/generate-luks2-metadata-size-256k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-256k.img.sh @@ -69,13 +69,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh index 736fdc7f..9d12dc1e 100755 --- a/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-2m-secondary.img.sh @@ -70,13 +70,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-2m.img.sh b/tests/generators/generate-luks2-metadata-size-2m.img.sh index df6afefb..eef144fb 100755 --- a/tests/generators/generate-luks2-metadata-size-2m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-2m.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh index 4de46368..1aa1907f 100755 --- a/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-32k-secondary.img.sh @@ -71,13 +71,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-32k.img.sh b/tests/generators/generate-luks2-metadata-size-32k.img.sh index 909859fb..2e485b9e 100755 --- a/tests/generators/generate-luks2-metadata-size-32k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-32k.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh index 2b8c55ec..5bd30a08 100755 --- a/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-4m-secondary.img.sh @@ -70,13 +70,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-4m.img.sh b/tests/generators/generate-luks2-metadata-size-4m.img.sh index f024e560..5f46f171 100755 --- a/tests/generators/generate-luks2-metadata-size-4m.img.sh +++ b/tests/generators/generate-luks2-metadata-size-4m.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh index 8bd29e7a..29664081 100755 --- a/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-512k-secondary.img.sh @@ -71,13 +71,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-512k.img.sh b/tests/generators/generate-luks2-metadata-size-512k.img.sh index dc047aad..29ca19b3 100755 --- a/tests/generators/generate-luks2-metadata-size-512k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-512k.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-64k-inv-area-c0.img.sh b/tests/generators/generate-luks2-metadata-size-64k-inv-area-c0.img.sh index 7c2f813e..84a3b074 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-inv-area-c0.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-inv-area-c0.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-64k-inv-area-c1.img.sh b/tests/generators/generate-luks2-metadata-size-64k-inv-area-c1.img.sh index 61f26c02..aba61d32 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-inv-area-c1.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-inv-area-c1.img.sh @@ -70,13 +70,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-64k-inv-keyslots-size-c0.img.sh b/tests/generators/generate-luks2-metadata-size-64k-inv-keyslots-size-c0.img.sh index ac5506f0..7a48b528 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-inv-keyslots-size-c0.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-inv-keyslots-size-c0.img.sh @@ -70,13 +70,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh index 7a85744a..8d2a008f 100755 --- a/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k-secondary.img.sh @@ -71,13 +71,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-64k.img.sh b/tests/generators/generate-luks2-metadata-size-64k.img.sh index d0206545..e0c17f96 100755 --- a/tests/generators/generate-luks2-metadata-size-64k.img.sh +++ b/tests/generators/generate-luks2-metadata-size-64k.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh b/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh index 6d41d303..a118d6fd 100755 --- a/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh +++ b/tests/generators/generate-luks2-metadata-size-invalid-secondary.img.sh @@ -70,13 +70,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res1 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-metadata-size-invalid.img.sh b/tests/generators/generate-luks2-metadata-size-invalid.img.sh index ba8b7120..16645e9e 100755 --- a/tests/generators/generate-luks2-metadata-size-invalid.img.sh +++ b/tests/generators/generate-luks2-metadata-size-invalid.img.sh @@ -68,13 +68,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-missing-keyslot-referenced-in-digest.img.sh b/tests/generators/generate-luks2-missing-keyslot-referenced-in-digest.img.sh index 466cd5e8..fcdf65e8 100755 --- a/tests/generators/generate-luks2-missing-keyslot-referenced-in-digest.img.sh +++ b/tests/generators/generate-luks2-missing-keyslot-referenced-in-digest.img.sh @@ -48,13 +48,7 @@ function check() test $((arr_len+1)) -eq $new_arr_len || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-missing-keyslot-referenced-in-token.img.sh b/tests/generators/generate-luks2-missing-keyslot-referenced-in-token.img.sh index 8cd55830..7c8fd849 100755 --- a/tests/generators/generate-luks2-missing-keyslot-referenced-in-token.img.sh +++ b/tests/generators/generate-luks2-missing-keyslot-referenced-in-token.img.sh @@ -46,13 +46,7 @@ function check() test $new_arr_len -eq 2 || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-missing-segment-referenced-in-digest.img.sh b/tests/generators/generate-luks2-missing-segment-referenced-in-digest.img.sh index 3a0c9039..e1075540 100755 --- a/tests/generators/generate-luks2-missing-segment-referenced-in-digest.img.sh +++ b/tests/generators/generate-luks2-missing-segment-referenced-in-digest.img.sh @@ -48,13 +48,7 @@ function check() test $((arr_len+1)) -eq $new_arr_len || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-missing-trailing-null-byte-json0.img.sh b/tests/generators/generate-luks2-missing-trailing-null-byte-json0.img.sh index 59ac8073..5aa9f5a5 100755 --- a/tests/generators/generate-luks2-missing-trailing-null-byte-json0.img.sh +++ b/tests/generators/generate-luks2-missing-trailing-null-byte-json0.img.sh @@ -63,13 +63,7 @@ function check() test ${#json_str_res0} -eq $((LUKS2_JSON_SIZE*512)) || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-non-null-byte-beyond-json0.img.sh b/tests/generators/generate-luks2-non-null-byte-beyond-json0.img.sh index 44bde5a1..9e11adbd 100755 --- a/tests/generators/generate-luks2-non-null-byte-beyond-json0.img.sh +++ b/tests/generators/generate-luks2-non-null-byte-beyond-json0.img.sh @@ -46,13 +46,7 @@ function check() test ${json_str_res0:len:1} = "X" || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-non-null-bytes-beyond-json0.img.sh b/tests/generators/generate-luks2-non-null-bytes-beyond-json0.img.sh index e56736b2..d4d2e2fb 100755 --- a/tests/generators/generate-luks2-non-null-bytes-beyond-json0.img.sh +++ b/tests/generators/generate-luks2-non-null-bytes-beyond-json0.img.sh @@ -50,13 +50,7 @@ function check() test "$json_str_res0" = "$QUOTE" || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh b/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh index 9ca7a44a..786cb8de 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c0-json0.img.sh @@ -42,13 +42,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh b/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh index c42292c2..f182f11c 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c1-json0.img.sh @@ -44,13 +44,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh b/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh index 4e45365d..0243058c 100755 --- a/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh +++ b/tests/generators/generate-luks2-overlapping-areas-c2-json0.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh b/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh index 81d47b68..1b0f10e5 100755 --- a/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh +++ b/tests/generators/generate-luks2-pbkdf2-leftover-params-0.img.sh @@ -45,13 +45,7 @@ function check() test $((obj_len+2)) -eq $new_obj_len || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh b/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh index 7178b24f..1d78dc11 100755 --- a/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh +++ b/tests/generators/generate-luks2-pbkdf2-leftover-params-1.img.sh @@ -45,13 +45,7 @@ function check() test $((obj_len+2)) -eq $new_obj_len || exit 2 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh b/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh index ff250819..146de213 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-encryption.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh b/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh index 3c4f6fbc..8c1fe274 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-ivoffset.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh b/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh index 75248d71..a83583d4 100755 --- a/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-missing-sectorsize.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh index 8ea9429d..e7c95b5c 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-encryption.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh index fca3bdcc..fb620a50 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-ivoffset.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-0.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-0.img.sh index 36f9344b..5b39662a 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-0.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-0.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-1.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-1.img.sh index ca121835..2855c1ba 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-1.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-1.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-2.img.sh b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-2.img.sh index ae729bdd..51b95d90 100755 --- a/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-2.img.sh +++ b/tests/generators/generate-luks2-segment-crypt-wrong-sectorsize-2.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-missing-offset.img.sh b/tests/generators/generate-luks2-segment-missing-offset.img.sh index 3426e7fd..9fc968a1 100755 --- a/tests/generators/generate-luks2-segment-missing-offset.img.sh +++ b/tests/generators/generate-luks2-segment-missing-offset.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-missing-size.img.sh b/tests/generators/generate-luks2-segment-missing-size.img.sh index ee8f638f..a48831ed 100755 --- a/tests/generators/generate-luks2-segment-missing-size.img.sh +++ b/tests/generators/generate-luks2-segment-missing-size.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-missing-type.img.sh b/tests/generators/generate-luks2-segment-missing-type.img.sh index b6cc366c..d86243c9 100755 --- a/tests/generators/generate-luks2-segment-missing-type.img.sh +++ b/tests/generators/generate-luks2-segment-missing-type.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-two.img.sh b/tests/generators/generate-luks2-segment-two.img.sh index bf5dd45e..893e50ea 100755 --- a/tests/generators/generate-luks2-segment-two.img.sh +++ b/tests/generators/generate-luks2-segment-two.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-unknown-type.img.sh b/tests/generators/generate-luks2-segment-unknown-type.img.sh index 36bd7357..1d956951 100755 --- a/tests/generators/generate-luks2-segment-unknown-type.img.sh +++ b/tests/generators/generate-luks2-segment-unknown-type.img.sh @@ -42,13 +42,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-backup-key-0.img.sh b/tests/generators/generate-luks2-segment-wrong-backup-key-0.img.sh index dc0c3118..d9f9b102 100755 --- a/tests/generators/generate-luks2-segment-wrong-backup-key-0.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-backup-key-0.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected segments count") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-backup-key-1.img.sh b/tests/generators/generate-luks2-segment-wrong-backup-key-1.img.sh index e7c9569b..86e70eb1 100755 --- a/tests/generators/generate-luks2-segment-wrong-backup-key-1.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-backup-key-1.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected segments count") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh b/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh index 81d9e0ab..fc22d9f9 100755 --- a/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-flags-element.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-flags.img.sh b/tests/generators/generate-luks2-segment-wrong-flags.img.sh index 79e36a85..9ef953f1 100755 --- a/tests/generators/generate-luks2-segment-wrong-flags.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-flags.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-offset.img.sh b/tests/generators/generate-luks2-segment-wrong-offset.img.sh index c595cc77..81f536a5 100755 --- a/tests/generators/generate-luks2-segment-wrong-offset.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-offset.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-size-0.img.sh b/tests/generators/generate-luks2-segment-wrong-size-0.img.sh index ab7f6ece..b3db80a8 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-0.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-0.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-size-1.img.sh b/tests/generators/generate-luks2-segment-wrong-size-1.img.sh index 31dabeb0..f5624c88 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-1.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-1.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-size-2.img.sh b/tests/generators/generate-luks2-segment-wrong-size-2.img.sh index a707934c..40441cb0 100755 --- a/tests/generators/generate-luks2-segment-wrong-size-2.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-size-2.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-segment-wrong-type.img.sh b/tests/generators/generate-luks2-segment-wrong-type.img.sh index 6df420a8..de1955cd 100755 --- a/tests/generators/generate-luks2-segment-wrong-type.img.sh +++ b/tests/generators/generate-luks2-segment-wrong-type.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-uint64-max-segment-size.img.sh b/tests/generators/generate-luks2-uint64-max-segment-size.img.sh index a060ba10..18134ca6 100755 --- a/tests/generators/generate-luks2-uint64-max-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-max-segment-size.img.sh @@ -42,13 +42,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh b/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh index fcf2c83d..ffc4ca23 100755 --- a/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-overflow-segment-size.img.sh @@ -40,13 +40,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh b/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh index 7dc8baf3..f111b1e7 100755 --- a/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh +++ b/tests/generators/generate-luks2-uint64-signed-segment-size.img.sh @@ -41,13 +41,7 @@ function check() then error("Unexpected value in result json") else empty end' $TMPDIR/json_res0 || exit 5 } -function cleanup() -{ - rm -f $TMPDIR/* - rm -fd $TMPDIR -} - lib_prepare $@ generate check -cleanup +lib_cleanup diff --git a/tests/generators/lib.sh b/tests/generators/lib.sh index 0eb3e348..bcdb3601 100644 --- a/tests/generators/lib.sh +++ b/tests/generators/lib.sh @@ -204,3 +204,9 @@ function lib_prepare() read_luks2_bin_hdr0 $TGT_IMG $TMPDIR/hdr0 read_luks2_bin_hdr1 $TGT_IMG $TMPDIR/hdr1 } + +function lib_cleanup() +{ + rm -f $TMPDIR/* + rm -fd $TMPDIR +}