X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-argmatch.c;h=ae1ad510d618fb224dbeedf35fce841da67bc949;hb=4f6a7ef5f2097b501ddeac9db94d02306e4546d0;hp=c37fc5dc691b9076fb6037ed422d447ee688a458;hpb=c417407f31b86913a34d80bd4af4bae43d9793ba;p=gnulib.git

diff --git a/tests/test-argmatch.c b/tests/test-argmatch.c
index c37fc5dc6..ae1ad510d 100644
--- a/tests/test-argmatch.c
+++ b/tests/test-argmatch.c
@@ -1,10 +1,10 @@
 /* Test of exact or abbreviated match search.
-   Copyright (C) 1990, 1998-1999, 2001-2007 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998-1999, 2001-2011 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,23 +12,28 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007, based on test code
    by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "argmatch.h"
 
 #include <stdlib.h>
 
 #include "progname.h"
+#include "macros.h"
+
+/* Some packages define ARGMATCH_DIE and ARGMATCH_DIE_DECL in <config.h>, and
+   thus must link with a definition of that function.  Provide it here.  */
+#ifdef ARGMATCH_DIE_DECL
 
-#define ASSERT(expr) if (!(expr)) abort ();
+_Noreturn ARGMATCH_DIE_DECL;
+ARGMATCH_DIE_DECL { exit (1); }
+
+#endif
 
 enum backup_type
 {
@@ -94,4 +99,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-