[PATCH e2fsprogs] blkid: fix swap tests (again)

[PATCH e2fsprogs] blkid: fix swap tests (again)

[Eric Sandeen]

Some architectures (ppc ...) need a bigger swapfile than is shipped,
in the test image so the current re-make of swap was failing.

We could either ship a bigger image or just dd a bigger file...

There is one more minor problem with the tests; older mkswap does not
support the -U uuid specification.  I'm not sure offhand what to do
about that problem, or if it really needs fixing.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

Index: devel/e2fsprogs-1.41-WIP/lib/blkid/test_probe.in
===================================================================
--- e2fsprogs-1.41-WIP.orig/lib/blkid/test_probe.in	2008-06-16 12:08:45.000000000 -0500
+++ e2fsprogs-1.41-WIP/lib/blkid/test_probe.in	2008-06-16 14:56:33.437233901 -0500
@@ -20,10 +20,13 @@ do
 		continue
 	fi
 	bunzip2 < $SRCDIR/tests/$i.img.bz2 > tests/tmp/test.img.$$
-	# swap is native-endian, so regenerate before testing
 	if [ "$i" = "swap0" ]; then
+		# swap is native-endian, so regenerate before testing
+		dd if=/dev/zero of=tests/tmp/test.img.$$ bs=16k count=64
 		mkswap -v0 tests/tmp/test.img.$$ > /dev/null
 	elif [ "$i" = "swap1" ]; then
+		# swap is native-endian, so regenerate before testing
+		dd if=/dev/zero of=tests/tmp/test.img.$$ bs=16k count=64
 		mkswap -v1 -L SWAP-TEST -U 8ff8e77f-8553-485e-8656-58be67a81666 tests/tmp/test.img.$$ >/dev/null
 	fi
 	./tst_probe tests/tmp/test.img.$$ > tests/$i.out

Re: [PATCH e2fsprogs] blkid: fix swap tests (again)

[Theodore Tso]

On Wed, Jun 18, 2008 at 02:58:55PM -0500, Eric Sandeen wrote:
> Some architectures (ppc ...) need a bigger swapfile than is shipped,
> in the test image so the current re-make of swap was failing.
> 
> We could either ship a bigger image or just dd a bigger file...
> 
> There is one more minor problem with the tests; older mkswap does not
> support the -U uuid specification.  I'm not sure offhand what to do
> about that problem, or if it really needs fixing.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Applied, thanks.

						- Ted