All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] btrfs-progs: tests: Move extract_image out of check_all_images for common use
@ 2015-09-04 13:23 Zhao Lei
  2015-09-04 13:23 ` [PATCH 2/3] btrfs-progs: tests: Introduce fsck-tests/018-leaf-accross-stripes Zhao Lei
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Zhao Lei @ 2015-09-04 13:23 UTC (permalink / raw)
  To: linux-btrfs; +Cc: Zhao Lei

Move code for extract image file to a function from check_all_images()
for common use, so caller can use this function to extrace single
image file.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
---
 tests/common | 73 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 32 deletions(-)

diff --git a/tests/common b/tests/common
index 63b0d9f..0c0efef 100644
--- a/tests/common
+++ b/tests/common
@@ -62,6 +62,44 @@ check_image()
 	run_check $TOP/btrfs check $image
 }
 
+extract_image()
+{
+	local image="$1"
+
+	local cleanme=
+	case "$image" in
+	*.img)
+		rm -f $image.restored
+		: ;;
+	*.img.xz)
+		xz --decompress --keep "$image" || \
+			_fail "failed to decompress image $image"
+		image=${image%%.xz}
+		rm -f $image.restored
+		cleanme=$image
+		;;
+	*.raw)
+		cp --sparse=auto $image $image.restored
+		;;
+	*.raw.xz)
+		xz --decompress --keep "$image" || \
+			_fail "failed to decompress image $image"
+		image=${image%%.xz}
+		mv "$image" "$image".restored
+		;;
+	esac
+
+	if ! [ -f $image.restored ]; then
+		echo "restoring image $(basename $image)" >> $RESULTS
+		$TOP/btrfs-image -r $image $image.restored || \
+			_fail "failed to restore image $image"
+	fi
+
+	[[ "$cleanme" ]] && rm -f "$cleanme"
+
+	EXTRACT_IMAGE_OUTPUT="$image.restored"
+}
+
 # Process all image dumps in a given directory,
 # - raw btrfs filesystem images, suffix .raw
 # - dtto compressed by XZ, suffix .raw.xz
@@ -75,38 +113,9 @@ check_all_images()
 				-iname '*.raw' -o 	\
 				-iname '*.raw.xz' \) | sort)
 	do
-		cleanme=
-		case "$image" in
-		*.img)
-			rm -f $image.restored
-			: ;;
-		*.img.xz)
-			xz --decompress --keep "$image" || \
-				_fail "failed to decompress image $image"
-			image=${image%%.xz}
-			rm -f $image.restored
-			cleanme=$image
-			;;
-		*.raw)
-			cp --sparse=auto $image $image.restored
-			;;
-		*.raw.xz)
-			xz --decompress --keep "$image" || \
-				_fail "failed to decompress image $image"
-			image=${image%%.xz}
-			mv "$image" "$image".restored
-			;;
-		esac
-
-		if ! [ -f $image.restored ]; then
-			echo "restoring image $(basename $image)" >> $RESULTS
-			$TOP/btrfs-image -r $image $image.restored || \
-				_fail "failed to restore image $image"
-		fi
-
-		check_image $image.restored
-
-		rm -f $image.restored $cleanme
+		extract_image "$image"
+		check_image "$EXTRACT_IMAGE_OUTPUT"
+		rm -f "$EXTRACT_IMAGE_OUTPUT"
 	done
 }
 
-- 
1.8.5.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-22  7:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-04 13:23 [PATCH 1/3] btrfs-progs: tests: Move extract_image out of check_all_images for common use Zhao Lei
2015-09-04 13:23 ` [PATCH 2/3] btrfs-progs: tests: Introduce fsck-tests/018-leaf-accross-stripes Zhao Lei
2015-09-04 13:23 ` [PATCH 3/3] btrfs-progs: tests: Introduce misc-tests/008-leaf-accross-stripes Zhao Lei
2015-09-09  1:46   ` Qu Wenruo
2015-09-09  9:09     ` Zhao Lei
2015-09-22  7:14 ` [PATCH 1/3] btrfs-progs: tests: Move extract_image out of check_all_images for common use David Sterba

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.