From ff27d1ecdee89bea7e677a43bb1bfaa74256cb3a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 17 Jan 2010 14:18:39 +0100 Subject: [PATCH] Fix test acoutbs2.test. * tests/acoutbs2: In the generated configure.in: add proper calls to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of PACKAGE and VERSION. Add a call to aclocal before calling automake. Updated copyright years. * tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test. Signed-off-by: Ralf Wildenhues --- ChangeLog | 7 +++++++ tests/Makefile.am | 1 - tests/Makefile.in | 1 - tests/acoutbs2.test | 7 ++++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b3ac7565..da0968a1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-01-17 Stefano Lattarini + Fix test acoutbs2.test. + * tests/acoutbs2: In the generated configure.in: add proper calls + to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of + PACKAGE and VERSION. Add a call to aclocal before calling automake. + Updated copyright years. + * tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test. + Add forgotten test scripts to $(TESTS). * tests/Makefile.am (TESTS): Added test scripts present on the filesystem, which were erroneously left out from $(TESTS): diff --git a/tests/Makefile.am b/tests/Makefile.am index f06701aaa..c1600284c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,7 +17,6 @@ # along with this program. If not, see . XFAIL_TESTS = \ -acoutbs2.test \ all.test \ auxdir2.test \ cond17.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index d8feddf8a..295480382 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -243,7 +243,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ XFAIL_TESTS = \ -acoutbs2.test \ all.test \ auxdir2.test \ cond17.test \ diff --git a/tests/acoutbs2.test b/tests/acoutbs2.test index 2df24c225..3b56a2167 100755 --- a/tests/acoutbs2.test +++ b/tests/acoutbs2.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2000, 2002, 2010 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 @@ -20,8 +20,8 @@ . ./defs || Exit 1 cat > configure.in << 'END' -PACKAGE=nonesuch -VERSION=nonesuch +AC_INIT +AM_INIT_AUTOMAKE(nonesuch, nonesuch) AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_MAKE_SET @@ -34,4 +34,5 @@ END : > Makefile.am : > zot.in +$ACLOCAL || Exit 1 $AUTOMAKE -- 2.47.2