I've just rebased next's 100+ changes and pulled them onto master. Plus one more:
>From 96bb50a3b13b4d855cc472572a9360f4b2f2df48 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Thu, 17 Sep 2009 15:20:38 +0200 Subject: [PATCH] tests: correct t1100-busy-label This test had two problems: FS-manipulation (creates a FAT fs) even for non-512-byte sectors, and it had a now-unexpected line in the expected output of its final command. * tests/t1100-busy-label.sh: Use require_512_byte_sector_size_, so that we skip this test when in non-512-sector size mode. Remove the now-bogus line. Note: this test is not normally run. In order to run it, you have to run as root and set two envvars, e.g., sudo make check DEVICE_TO_ERASE=/dev/sde DEVICE_TO_ERASE_SIZE=16.4MB --- tests/t1100-busy-label.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/t1100-busy-label.sh b/tests/t1100-busy-label.sh index cc9e8e2..a688a2d 100755 --- a/tests/t1100-busy-label.sh +++ b/tests/t1100-busy-label.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2007 Free Software Foundation, Inc. +# Copyright (C) 2007-2009 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ erasable_device_required_=1 : ${srcdir=.} . $srcdir/test-lib.sh +require_512_byte_sector_size_ dev=$DEVICE_TO_ERASE test_expect_success \ @@ -67,7 +68,6 @@ test_expect_failure \ fail=0 cat <<EOF > exp || fail=1 Warning: Partition(s) on $dev are being used. -parted: invalid token: msdos Ignore/Cancel? c EOF test_expect_success 'create expected output file' 'test $fail = 0' -- 1.6.5.rc1.192.g63b0 _______________________________________________ parted-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/parted-devel
