automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Backport Exit function from master, for easier cherry-picking.


From: Ralf Wildenhues
Subject: Backport Exit function from master, for easier cherry-picking.
Date: Sun, 1 Mar 2009 17:28:20 +0100
User-agent: Mutt/1.5.18 (2008-05-17)

I noticed that I messed up backporting tests from master to branch-1-10
several times already, due to the Exit function.  So let's just avoid
this hassle altogether.  Pushed to branch-1-10.

Cheers,
Ralf

    Backport Exit function from master, for easier cherry-picking.
    
    * tests/defs.in (Exit): New function, backported from master,
    to allow easier backporting of tests from master.

diff --git a/tests/defs.in b/tests/defs.in
index a1ddd2a..85e95e5 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -2,7 +2,7 @@
 # @configure_input@
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -241,6 +241,15 @@ case "$srcdir" in
     ;;
 esac
 
+# Automake 1.10a uses a trap for cleanup and an exit wrapper function.
+# We add this here, too, in order to facilitate backporting tests.
+Exit ()
+{
+  set +e
+  (exit $1)
+  exit $1
+}
+
 chmod -R a+rwx testSubDir > /dev/null 2>&1
 rm -rf testSubDir > /dev/null 2>&1
 mkdir testSubDir




reply via email to

[Prev in Thread] Current Thread [Next in Thread]