30 lines
998 B
Diff
30 lines
998 B
Diff
From 60d7ceec9cbabbf114bb05b391f355fdbe418571 Mon Sep 17 00:00:00 2001
|
|
From: Phillip Susi <psusi@ubuntu.com>
|
|
Date: Fri, 18 Apr 2014 12:29:57 -0400
|
|
Subject: [PATCH 092/131] tests: fix t1700
|
|
|
|
bb181a7e: "tests: Use force for xfs in t1700 and a larger file" caused
|
|
the previous filesystem signatures to be left in the image file
|
|
causing mkfs.nilfs2 to complain that there is already an xfs filesystem
|
|
there, and hang the test suite waiting for an answer to proceed or not.
|
|
Remove the file between filesystems so it is recreated cleanly again.
|
|
---
|
|
tests/t1700-probe-fs.sh | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/tests/t1700-probe-fs.sh b/tests/t1700-probe-fs.sh
|
|
index bf6ad9c..2ba2f95 100755
|
|
--- a/tests/t1700-probe-fs.sh
|
|
+++ b/tests/t1700-probe-fs.sh
|
|
@@ -39,6 +39,7 @@ for type in ext2 ext3 ext4 btrfs xfs nilfs2; do
|
|
# probe the $type file system
|
|
parted -m -s $dev u s print >out 2>&1 || fail=1
|
|
grep '^1:.*:'$type'::;$' out || { cat out; fail=1; }
|
|
+ rm $dev
|
|
|
|
done
|
|
|
|
--
|
|
1.9.3
|
|
|