Re: [bug-patch] "make check" failures (latest in git)

[Jim Meyering]

Andreas Gruenbacher wrote:
> On Sunday, 29 March 2009 10:18:08 Jim Meyering wrote:
>> Hi,
>>
>> Using the latest from git,
>>
>>   commit df890caf03184fe72f6aa25f9392a46dd187f90f
>>   Date:   Sun Mar 29 00:39:48 2009 +0100
>>
>> when I run "make -j1 check", I get this:
>>
>>   [tests/backup-prefix-suffix]
>>   [24] patch -b -p1 < ab.diff -- ok
>>   [28] cat f.orig -- FAILED
>>   --- expected
>>   +++ got
>>   @@ -1 +1 @@
>>   -one
>>   +cat: f.orig: No such file or directory
>
> Thanks for testing.
>
> You probably have SIMPLE_BACKUP_SUFFIX, VERSION_CONTROL, or
> PATCH_VERSION_CONTROL set in the environment. I have fixed the test suite in
> commit af57793 now. In case that shouldn't help, what does the attached patch
> give?

Right.  That was part of it.
The rest were due to recent GNU ls using "." as the AACM indicator.

This patch fixes the rest.  Now "make -jN check" succeeds for me.
Thanks!

>From 51524a232094c9a4aa2dd1e55b8ecf36ac7c7520 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 30 Mar 2009 06:56:44 +0200
Subject: [PATCH] tests: accommodate ls' "alternate access control method" 
indicator

ls can output an additional byte after a file's permissions string,
e.g., rather than "rwxr--r-- ..." it can output "rwxr--r--+ ..."
or "rwxr--r--. ..." to indicate the presence of an ACL.
* tests/create-delete: Adjust sed filter to accommodate that.
* tests/preserve-mode-and-timestamp: Likewise.
---
 ChangeLog                         |   11 ++++++++++-
 tests/create-delete               |    2 +-
 tests/preserve-mode-and-timestamp |   10 +++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 672aa02..7f5bf87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-30  Jim Meyering  <address@hidden>
+
+       tests: accommodate ls' "alternate access control method" indicator
+       ls can output an additional byte after a file's permissions string,
+       e.g., rather than "rwxr--r-- ..." it can output "rwxr--r--+ ..."
+       or "rwxr--r--. ..." to indicate the presence of an ACL.
+       * tests/create-delete: Adjust sed filter to accommodate that.
+       * tests/preserve-mode-and-timestamp: Likewise.
+
 2009-03-30  Andreas Gruenbacher  <address@hidden>

        * tests/test-lib.sh: Unset environment variables that influence
@@ -2636,7 +2645,7 @@ Sun Dec 17 17:29:48 1989  Jim Kingdon  (kingdon at 
hobbes.ai.mit.edu)
 Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall.

 Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001,
-2002 Free Software Foundation, Inc.
+2002, 2009 Free Software Foundation, Inc.

 This file is part of GNU Patch.

diff --git a/tests/create-delete b/tests/create-delete
index 2f2e4c4..b80aec9 100644
--- a/tests/create-delete
+++ b/tests/create-delete
@@ -65,7 +65,7 @@ Hunk #1 FAILED at 1.
 Status: 1
 EOF

-check 'ls -l f.orig | sed -e "s,^+,," -e "s, .*,,"' <<EOF
+check 'ls -l f.orig | sed "s,\(..........\).*,\1,"' <<EOF
 -rw-r--r--
 EOF

diff --git a/tests/preserve-mode-and-timestamp 
b/tests/preserve-mode-and-timestamp
index facfa3f..24dd96f 100644
--- a/tests/preserve-mode-and-timestamp
+++ b/tests/preserve-mode-and-timestamp
@@ -45,10 +45,10 @@ check 'date -u "+%Y-%m-%d %H:%M:%S %z" -r f' <<EOF
 $timestamp2
 EOF

-# POSIX allows a leading '+' to indicate the presence of extended
-# permissions like ACLs.
+# POSIX allows a byte like '+' or '.' in position 11 to indicate the
+# presence of extended permissions like ACLs.

-check 'ls -l f.orig | sed -e "s,^+,," -e "s, .*,,"' <<EOF
+check 'ls -l f.orig | sed "s,\(..........\).*,\1,"' <<EOF
 -rw-r--r--
 EOF

@@ -69,7 +69,7 @@ Not setting time of file f (time mismatch)
 Status: 1
 EOF

-check 'ls -l f.rej | sed -e "s,^+,," -e "s, .*,,"' <<EOF
+check 'ls -l f.rej | sed "s,\(..........\).*,\1,"' <<EOF
 -rw-r--r--
 EOF

@@ -90,6 +90,6 @@ Not setting time of file f (time mismatch)
 Status: 1
 EOF

-check 'set -- `ls -l f.rej`; echo $1' <<EOF
+check 'ls -l f.rej | sed "s,\(..........\).*,\1,"' <<EOF
 -rw-r-----
 EOF
--
1.6.2.rc1.285.gc5f54