diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | tests/Makefile.am.in | 5 | ||||
| -rw-r--r-- | tests/cut/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/head/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/join/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/pr/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/sort/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/tac/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/tail/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/test/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/tr/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/uniq/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/wc/Makefile.am | 3 |
13 files changed, 59 insertions, 29 deletions
@@ -1,5 +1,23 @@ 2006-08-19 Jim Meyering <jim@meyering.net> + Some of my 2006-07-03 changes to tests/*/Makefile.am were being + backed out due to updates provoked by the copyright changes. + * tests/Makefile.am.in (PATH): Prepend $(VG_PATH_PREFIX), so that + it propagates to the derived Makefile.am files. + ($(srcdir)/Makefile.am): Mark generated .am files as read-only, + so we don't mistakenly edit them again. + * tests/cut/Makefile.am: Regenerate. + * tests/head/Makefile.am: Likewise. + * tests/join/Makefile.am: Likewise. + * tests/pr/Makefile.am: Likewise. + * tests/sort/Makefile.am: Likewise. + * tests/tac/Makefile.am: Likewise. + * tests/tail/Makefile.am: Likewise. + * tests/test/Makefile.am: Likewise. + * tests/tr/Makefile.am: Likewise. + * tests/uniq/Makefile.am: Likewise. + * tests/wc/Makefile.am: Likewise. + * NEWS: Fix cp --sparse so that it preserves tail-end sparseness, even when the file's apparent size is not a multiple of its block size. * src/copy.c (copy_reg): Don't write a NUL before calling ftruncate. diff --git a/tests/Makefile.am.in b/tests/Makefile.am.in index 9002cab05..bcd7d7955 100644 --- a/tests/Makefile.am.in +++ b/tests/Makefile.am.in @@ -1,6 +1,6 @@ # Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -24,7 +24,7 @@ EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) noinst_SCRIPTS = $x-tests TESTS_ENVIRONMENT = \ - PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" + PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' @@ -49,4 +49,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am index 1494c4ec9..74b3d38eb 100644 --- a/tests/cut/Makefile.am +++ b/tests/cut/Makefile.am @@ -1,6 +1,7 @@ -# Make coreutils tests for 'cut'. -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1996, 1997, 2006 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 @@ -76,4 +77,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/head/Makefile.am b/tests/head/Makefile.am index d4591ed8e..d0bcffca5 100644 --- a/tests/head/Makefile.am +++ b/tests/head/Makefile.am @@ -1,6 +1,7 @@ -# Make coreutils tests for "head". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1997, 2006 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 @@ -63,4 +64,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am index a7dcb9ea5..54ce115b5 100644 --- a/tests/join/Makefile.am +++ b/tests/join/Makefile.am @@ -1,7 +1,7 @@ -# Make coreutils tests for "join". +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2004, 2006 Free -# Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 @@ -68,4 +68,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am index 9b0e841ea..45a0be9ad 100644 --- a/tests/pr/Makefile.am +++ b/tests/pr/Makefile.am @@ -1,7 +1,7 @@ -# Make coreutils tests for "pr". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 @@ -18,8 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -## Process this file with automake to produce Makefile.in -*-Makefile-*-. - ##test-files-begin x = pr explicit = 0F 0FF 0FFnt 0FFt 0FnFnt 0FnFt 0Fnt 0Ft 2-S_f-t_notab 2-Sf-t_notab \ @@ -154,4 +152,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am index c117ae114..5bb2fa70a 100644 --- a/tests/sort/Makefile.am +++ b/tests/sort/Makefile.am @@ -1,7 +1,7 @@ -# Make coreutils tests for "sort". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 @@ -92,4 +92,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/tac/Makefile.am b/tests/tac/Makefile.am index c98266d8c..915c38a98 100644 --- a/tests/tac/Makefile.am +++ b/tests/tac/Makefile.am @@ -1,4 +1,4 @@ -# Make coreutils tests for "tac". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- # Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 Free Software # Foundation, Inc. @@ -65,4 +65,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am index 4fc583665..7886e5d76 100644 --- a/tests/tail/Makefile.am +++ b/tests/tail/Makefile.am @@ -1,6 +1,6 @@ -# Make coreutils tests for "tail". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -73,4 +73,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/test/Makefile.am b/tests/test/Makefile.am index 2b05958c0..5790d1170 100644 --- a/tests/test/Makefile.am +++ b/tests/test/Makefile.am @@ -1,6 +1,6 @@ -# Make coreutils tests for "test". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1998, 2000, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -149,4 +149,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am index 4bebd6130..97f6f91d8 100644 --- a/tests/tr/Makefile.am +++ b/tests/tr/Makefile.am @@ -1,7 +1,7 @@ -# Make coreutils tests for "tr". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 @@ -77,4 +77,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/uniq/Makefile.am b/tests/uniq/Makefile.am index 73f23a149..b3bb3d17d 100644 --- a/tests/uniq/Makefile.am +++ b/tests/uniq/Makefile.am @@ -1,7 +1,7 @@ -# Make coreutils tests for "uniq". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 @@ -71,4 +71,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ diff --git a/tests/wc/Makefile.am b/tests/wc/Makefile.am index be6e68027..37d98049f 100644 --- a/tests/wc/Makefile.am +++ b/tests/wc/Makefile.am @@ -1,4 +1,4 @@ -# Make coreutils tests for "wc". -*-Makefile-*- +# Make coreutils tests. -*-Makefile-*- # Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 Free Software # Foundation, Inc. @@ -57,4 +57,5 @@ $(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script) echo "x = $$tool" >> $@t $(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t + chmod -w $@t mv $@t $@ |