far-progs: remove temp files on interrupt unless -k

1 files changed, 12 insertions, 9 deletions

diff --git a/test.pl b/test.pl
index 412f656..5b78e58 100755
--- a/test.pl
+++ b/test.pl
@@ -247,7 +247,19 @@ if ($src_type eq "zfs") {
 	die;
 }
 
+sub cleanup_temp {
+	if (!$keep_temp) {
+		ignore_local("umount", $dst_mnt);
+		ignore_remote("umount", $src_mnt);
+		ignore_local("rm", "-rf", $p_fardir);
+		if ($remote_host) {
+			ignore_remote("rm", "-rf", $p_fardir);
+		}
+	}
+}
+
 sub cleanup {
+	cleanup_temp();
 	if ($ssh_chld) {
 		kill "TERM", $ssh_chld;
 		unlink $ssh_socket;
@@ -430,15 +442,6 @@ if (@failed_tests) {
 	print "\nAll tests ok\n";
 }
 
-if (!$keep_temp) {
-	do_local("umount", $dst_mnt);
-	do_remote("umount", $src_mnt);
-	do_local("rm", "-rf", $p_fardir);
-	if ($remote_host) {
-		do_remote("rm", "-rf", $p_fardir);
-	}
-}
-
 exit($ex_ret);
 
 END {