From d2e298b45dd00cd328a3819ae4fd5f825ea49c33 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 13 Jan 2008 12:44:53 +0100 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ build-aux/check.mk | 1 + tests/check.mk | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dd353e7..b84dc49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-13 Jim Meyering + + 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 * configure.ac: Correct a non-portable use of sed. diff --git a/build-aux/check.mk b/build-aux/check.mk index 95f56cb..34169f5 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 63f11e4..03e3f70 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' \ -- 2.7.4