test generators: use one common cleanup function

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
+}