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.
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.
# 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
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'
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 $@
-# 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
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 $@
-# 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
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 $@
-# 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
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 $@
-# 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
# 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 \
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 $@
-# 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
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 $@
-# Make coreutils tests for "tac". -*-Makefile-*-
+# Make coreutils tests. -*-Makefile-*-
# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 Free Software
# Foundation, Inc.
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 $@
-# 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
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 $@
-# 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
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 $@
-# 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
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 $@
-# 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
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 $@
-# Make coreutils tests for "wc". -*-Makefile-*-
+# Make coreutils tests. -*-Makefile-*-
# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 Free Software
# Foundation, Inc.
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 $@