[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 .gitignore                |    3 ++-
 Makefile.am               |    1 +
 build-aux/git-log-fix     |    7 +++++++
 tests/Makefile.am         |    2 +-
 tests/init.cfg            |    5 +++--
 tests/t8001-loop-blkpg.sh |   12 +++---------
 6 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 319e7cd590ae16460cfecb70715bf41ceec81d1e
Author: Jim Meyering <meyering at redhat.com>
Date:   Tue Oct 9 15:40:33 2012 +0200

    build: do not rely on automake's AM_TESTS_ENVIRONMENT
    
    * tests/Makefile.am (TESTS_ENVIRONMENT): Rename from
    AM_TESTS_ENVIRONMENT, since it is not honored in automake-1.11.3
    after all.  This reverts commit v3.1-14-g2bd66d7.  For now, I'll
    leave the following commit that made bootstrap.conf require 1.11.2.
    Prompted by a report of test failure from Phillip Susi.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 80d5525..cdc1c4b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -98,7 +98,7 @@ sep = $(PATH_SEPARATOR)
 # variables that can perturb tests are unset or set to expected values.
 # The rest are envvar settings that propagate build-related Makefile
 # variables to test scripts.
-AM_TESTS_ENVIRONMENT =				\
+TESTS_ENVIRONMENT =				\
   tmp__=$$TMPDIR; test -d "$$tmp__" || tmp__=.;	\
   TMPDIR=$$tmp__; export TMPDIR;		\
   export					\

commit 569e59d08fe2ec5e836536371e0a974a58e83166
Author: Gilles Espinasse <g.esp at free.fr>
Date:   Sun Oct 7 15:40:23 2012 +0200

    tests: t8001: do not rely on "modprobe loop"
    
    Remove 'rmmod loop' and 'modprobe loop max_part=7' commands.
    The latter command may fail after the first command has run,
    leaving the machine with no loop support.
    
    This happens on my chroot, because:
    - rmmod does not depend on the availability of the loop module,
    - modprobe fails, since the kernel compiled inside the chroot
      is different from the running kernel.
    
    Instead, rely on t-lvm loop_setup_ to load the loop module, if required.

diff --git a/tests/t8001-loop-blkpg.sh b/tests/t8001-loop-blkpg.sh
index deef18b..9afde4a 100755
--- a/tests/t8001-loop-blkpg.sh
+++ b/tests/t8001-loop-blkpg.sh
@@ -20,6 +20,7 @@
 
 require_root_
 require_udevadm_settle_
+lvm_init_root_dir_
 
 cleanup_fn_()
 {
@@ -27,21 +28,14 @@ cleanup_fn_()
     && { udevadm settle --timeout=3; losetup -d "$loopdev"; }
 }
 
-# If the loop module is loaded, unload it first
-if lsmod | grep '^loop[[:space:]]'; then
-    rmmod loop || fail=1
-fi
-
-# Insert loop module with max_part > 1
-modprobe loop max_part=7 || fail=1
-
 # Create backing file
 dd if=/dev/zero of=backing_file bs=1M count=4 >/dev/null 2>&1 || fail=1
 
 # Set up loop device on top of backing file
-loopdev=$(losetup -f --show backing_file)
+loopdev=$(loop_setup_ backing_file)
 test -z "$loopdev" && fail=1
 
+# Skip this test if loop devices are not partitionable.
 require_partitionable_loop_device_ $loopdev
 
 # Expect this to succeed

commit 5fc054beb415344a0ce44c19e554937c9158d08e
Author: Jim Meyering <meyering at redhat.com>
Date:   Tue Oct 9 14:02:15 2012 +0200

    tests: improve test for partitionable loop devices
    
    * tests/init.cfg (require_partitionable_loop_device_): Skip
    when cat fails.

diff --git a/tests/init.cfg b/tests/init.cfg
index 24b10bc..dc8b2bc 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -120,8 +120,9 @@ require_erasable_()
 # At least Fedora 16 (kernel 3.1.6-1.fc16.x86_64) fails this test.
 require_partitionable_loop_device_()
 {
-  case $(cat /sys/devices/virtual/block/$(basename $1)/ext_range) in
-    0|1) skip_ your system does not support loop partitioning;;
+  local f=/sys/devices/virtual/block/$(basename $1)/ext_range
+  case $(cat "$f") in
+    ''|0|1) skip_ your system is not configured to partition loop devices;;
   esac
 }
 

commit 718ac7342412aa7f32aaf3e9f379beb84883406e
Author: Jim Meyering <meyering at redhat.com>
Date:   Sat Oct 6 15:09:56 2012 +0200

    maint: fix an error in the preceding commit log
    
    Stefano Lattarini noticed an error in the log for
    commit v3.1-32-g478e472.  Arrange for that error
    to be fixed in the generated ChangeLog file.
    * build-aux/git-log-fix: New file.
    * Makefile.am (gen-ChangeLog): Adjust rule to use it.

diff --git a/.gitignore b/.gitignore
index 054d9ea..5bb95d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,8 @@ Makefile.in
 TAGS
 aclocal.m4
 autom4te.cache
-build-aux
+/build-aux/*
+!/build-aux/git-log-fix
 config.cache
 config.h
 config.hin
diff --git a/Makefile.am b/Makefile.am
index 5e52a42..686b61c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,6 +107,7 @@ gen_start_date = 2000-01-01
 gen-ChangeLog:
 	if test -d .git; then						\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
+	    --amend=$(srcdir)/build-aux/git-log-fix			\
 	    --since=$(gen_start_date) > $(distdir)/cl-t;		\
 	  rm -f $(distdir)/ChangeLog;					\
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
new file mode 100644
index 0000000..e2a68ee
--- /dev/null
+++ b/build-aux/git-log-fix
@@ -0,0 +1,7 @@
+# This file is expected to be used via gitlog-to-changelog's --amend=FILE
+# option.  It specifies what changes to make to each given SHA1's commit
+# log and metadata, using Perl-eval'able expressions.
+
+478e472bf9f1c76b66a35ea75b45110152e5207d
+# Fix the log message:
+s,stderr,/dev/null,