[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] Fix test acoutbs2.test
From: |
Stefano Lattarini |
Subject: |
[PATCH 3/4] Fix test acoutbs2.test |
Date: |
Fri, 11 Dec 2009 15:34:16 +0100 |
User-agent: |
KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.2; i686; ; ) |
This patch fixes some bugs in the test script acoutbs2.test (missing
AM_INIT_AUTOMAKE and AC_INIT, missing call to $ACLOCAL), which
prevented it from working.
From d9772a26fdd520b6e816589de66969d11457d661 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 11 Dec 2009 13:17:40 +0100
Subject: [PATCH 3/4] 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.
* tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
---
ChangeLog | 8 ++++++++
tests/Makefile.am | 1 -
tests/Makefile.in | 1 -
tests/acoutbs2.test | 5 +++--
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1239972..1efa8b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-12-11 Stefano Lattarini <address@hidden>
+ 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.
+ * tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
+
+2009-12-11 Stefano Lattarini <address@hidden>
+
Add forgotten test scripts to $(TESTS).
* tests/Makefile.am (TESTS): Added test scripts present on the
filesystem, which were erronneously left out from $(TESTS):
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 35dc69a..eac4738 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to create Makefile.in
XFAIL_TESTS = \
-acoutbs2.test \
all.test \
auxdir2.test \
cond17.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 30721f0..fa2b3d0 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -234,7 +234,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 2df24c2..02ff608 100755
--- a/tests/acoutbs2.test
+++ b/tests/acoutbs2.test
@@ -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
--
1.6.5