FYI: 5 small changes

[Jim Meyering]

These are test-related, except the last one,
which is to avoid a warning.

>From b5b3690d069b0bd4a1d561a8c1b527768d067b5d Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 24 Nov 2008 10:03:25 +0100
Subject: [PATCH 1/5] tests: avoid failure of cp/link-heap on some systems

* tests/cp/link-heap: Raise virtual memory limit from 10,000
to 14,000, to avoid failure on Debian/unstable (libc6 2.7-16).
---
 tests/cp/link-heap |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tests/cp/link-heap b/tests/cp/link-heap
index b20c7d3..7aa142d 100755
--- a/tests/cp/link-heap
+++ b/tests/cp/link-heap
@@ -36,6 +36,6 @@ mkdir e || framework_failure
 mv $a $b e || framework_failure

 fail=0
-(ulimit -v 10000; cp -al e f) || fail=1
+(ulimit -v 14000; cp -al e f) || fail=1

 Exit $fail
--
1.6.0.4.1101.g642f8


>From 847ab6a518b0e5d88f4e1aba29aa1caeef889fa2 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 28 Nov 2008 21:32:39 +0100
Subject: [PATCH 2/5] tests: start long-running cp/link-heap earlier

* tests/Makefile.am (TESTS): Move cp/link-heap nearer the start of the
list, so that its termination doesn't delay a parallel "make check".
---
 tests/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8c768bb..307e5a8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -74,6 +74,7 @@ TESTS =                                               \
   misc/invalid-opt                             \
   rm/ext3-perf                                 \
   rm/cycle                                     \
+  cp/link-heap                                 \
   chmod/no-x                                   \
   chgrp/basic                                  \
   rm/dangling-symlink                          \
@@ -124,7 +125,7 @@ TESTS =                                             \
   misc/ptx                                     \
   misc/test                                    \
   misc/seq                                     \
-  misc/seq-long-double                                 \
+  misc/seq-long-double                         \
   misc/head                                    \
   misc/head-elide-tail                         \
   tail-2/tail-n0f                              \
@@ -262,7 +263,6 @@ TESTS =                                             \
   cp/file-perm-race                            \
   cp/into-self                                 \
   cp/link                                      \
-  cp/link-heap                                 \
   cp/link-no-deref                             \
   cp/link-preserve                             \
   cp/no-deref-link1                            \
--
1.6.0.4.1101.g642f8


>From d6a62182f07766296244ccc4f8c2d1a800e987bd Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 28 Nov 2008 22:08:09 +0100
Subject: [PATCH 3/5] build: don't reject definition of STREQ

* maint.mk (sc_prohibit_strcmp): Tighten rule: exclude
macro definitions like the one in system.h.
* .x-sc_prohibit_strcmp: Don't exempt src/system.h.
---
 .x-sc_prohibit_strcmp |    1 -
 maint.mk              |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.x-sc_prohibit_strcmp b/.x-sc_prohibit_strcmp
index fdceaf0..56631ab 100644
--- a/.x-sc_prohibit_strcmp
+++ b/.x-sc_prohibit_strcmp
@@ -1,2 +1 @@
-^src/system\.h
 ChangeLog
diff --git a/maint.mk b/maint.mk
index a7d0b86..cb3c6a5 100644
--- a/maint.mk
+++ b/maint.mk
@@ -132,7 +132,8 @@ sc_prohibit_atoi_atof:
 # Use STREQ rather than comparing strcmp == 0, or != 0.
 sc_prohibit_strcmp:
        @grep -nE '! *str''cmp *\(|\<str''cmp *\([^)]+\) *=='           \
-           $$($(VC_LIST_EXCEPT)) &&                                    \
+           $$($(VC_LIST_EXCEPT))                                       \
+         | grep -vE ':# *define STREQ\(' &&                            \
          { echo '$(ME): use STREQ in place of the above uses of str''cmp' \
                1>&2; exit 1; } || :

--
1.6.0.4.1101.g642f8


>From 90f74735aa2f4753a3ae9cea848ef98daa31b7a6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 29 Nov 2008 11:22:00 +0100
Subject: [PATCH 4/5] tests: df: skip total-verify if df fails

* tests/df/total-verify: Skip the test if df fails.
---
 tests/df/total-verify |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tests/df/total-verify b/tests/df/total-verify
index caf6d1a..ba27747 100755
--- a/tests/df/total-verify
+++ b/tests/df/total-verify
@@ -23,6 +23,8 @@ fi

 . $srcdir/test-lib.sh

+df || skip_test_ "df fails"
+
 cat <<\EOF > check-df || framework_failure
 my ($total, $used, $avail) = (0, 0, 0);
 while (<>)
--
1.6.0.4.1101.g642f8


>From b14e5c40b9e7f6140a800a0b69eec693ea73fd09 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 30 Nov 2008 17:39:11 +0100
Subject: [PATCH 5/5] m4: avoid a warning from gcc's -Wstrict-prototypes

* m4/jm-macros.m4 (ARGMATCH_DIE_DECL): Use proper prototype for usage.
---
 m4/jm-macros.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 8fa1740..a53be5b 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -38,7 +38,7 @@ AC_DEFUN([coreutils_MACROS],
   # By default, argmatch should fail calling usage (1).
   AC_DEFINE(ARGMATCH_DIE, [usage (1)],
            [Define to the function xargmatch calls on failures.])
-  AC_DEFINE(ARGMATCH_DIE_DECL, [void usage ()],
+  AC_DEFINE(ARGMATCH_DIE_DECL, [void usage (int _e)],
            [Define to the declaration of the xargmatch failure function.])

   # used by ls
--
1.6.0.4.1101.g642f8