Den 2011-03-01 10:40 skrev Stefano Lattarini:
> On Tuesday 01 March 2011, Peter Rosin wrote:
>> Good, I pushed with that squashed in. I didn't dare a merge to
>> master as the conflicts looked scary.
>>
> I've taken a look and done the merge. Luckily, the conflicts were
> in fact strictly spurious (but yes, they truly look scary if you're
> not intimate with the latest changes in tests/defs, which indeed
> entailed quite a bit of code moving; sorry about that).
Thanks! I managed to guess that it probably just looked scary, but
the thing that held me back was the fact that the new ltinit.test
was written for maint, and I didn't know what parts of it needed
adjustment for master. I did spot the obsolete set -e but didn't
know what else I was missing (probably nothing, but I wasn't
sure...). Anyway, should I push the below or is the plan to
clean up all new 'set -e' fallouts "later"?
Cheers,
Peter
>From 3d5652da2f9cd83a60d29ee2af67ef5d54dd3b8d Mon Sep 17 00:00:00 2001
From: Peter Rosin <p...@lysator.liu.se>
Date: Tue, 1 Mar 2011 11:09:05 +0100
Subject: [PATCH] tests: Remove redundant enabling of errexit.
tests/ltinit.test: Zap redundant call to 'set -e'.
Signed-off-by: Peter Rosin <p...@lysator.liu.se>
---
ChangeLog | 3 +++
tests/ltinit.test | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a624ea4..b91d9ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-03-01 Peter Rosin <p...@lysator.liu.se>
+ tests: Remove redundant enabling of errexit.
+ tests/ltinit.test: Zap redundant call to 'set -e'.
+
test defs: unindent without temporary file
* tests/defs.in (commented_sed_unindent_prog): Commented Sed program
that strips the "proper" amount of leading whitespace.
diff --git a/tests/ltinit.test b/tests/ltinit.test
index b4eaad6..42c3913 100755
--- a/tests/ltinit.test
+++ b/tests/ltinit.test
@@ -21,8 +21,6 @@
required='libtoolize'
. ./defs || Exit 1
-set -e
-
cat >>configure.in <<'END'
AC_PROG_CC
dnl Older libtool versions don't define LT_PREREQ :-(
--
1.7.2.3
