summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-01-13 12:44:53 +0100
committerJim Meyering <meyering@redhat.com>2008-01-13 12:47:42 +0100
commitd2e298b45dd00cd328a3819ae4fd5f825ea49c33 (patch)
tree63f0a7ca974edb019e04dfd251f7633da8c778f1
parentf088d94d2526353d29b4fcde35e1adede7b6e944 (diff)
downloadcoreutils-d2e298b45dd00cd328a3819ae4fd5f825ea49c33.tar.xz
Remove each output redirection target before writing to it.
* tests/check.mk (vc_exe_in_TESTS): Remove t1 and t2 _first_, in case they exist beforehand and are not writable. * build-aux/check.mk (am__check_pre): Likewise, remove $@-t.
-rw-r--r--ChangeLog7
-rw-r--r--build-aux/check.mk1
-rw-r--r--tests/check.mk3
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dd353e740..b84dc492d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-13 Jim Meyering <meyering@redhat.com>
+
+ Remove each output redirection target before writing to it.
+ * tests/check.mk (vc_exe_in_TESTS): Remove t1 and t2 _first_,
+ in case they exist beforehand and are not writable.
+ * build-aux/check.mk (am__check_pre): Likewise, remove $@-t.
+
2008-01-13 Elias Pipping <pipping@gentoo.org>
* configure.ac: Correct a non-portable use of sed.
diff --git a/build-aux/check.mk b/build-aux/check.mk
index 95f56cb5f..34169f50d 100644
--- a/build-aux/check.mk
+++ b/build-aux/check.mk
@@ -95,6 +95,7 @@ SH_E_WORKAROUND = case $$- in *e*) set +e;; esac
am__check_pre = \
$(SH_E_WORKAROUND); \
tst=`echo "$$src" | sed 's|^.*/||'`; \
+rm -f $@-t; \
$(mkdir_p) "$$(dirname $@)" || exit; \
if test -f "./$$src"; then dir=./; \
elif test -f "$$src"; then dir=; \
diff --git a/tests/check.mk b/tests/check.mk
index 63f11e449..03e3f7042 100644
--- a/tests/check.mk
+++ b/tests/check.mk
@@ -1,5 +1,5 @@
# Include this file at the end of each tests/*/Makefile.am.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 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
@@ -19,6 +19,7 @@
# one that does not end in '\'.
_v = TESTS
vc_exe_in_TESTS: Makefile
+ @rm -f t1 t2
@if test -d $(top_srcdir)/.git && test $(srcdir) = .; then \
sed -n '/^$(_v) = \\$$/,/[^\]$$/p' $(srcdir)/Makefile.am \
| sed 's/^ *//;/^\$$.*/d;/^$(_v) =/d' \