[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Modernize, improve and/or fix various test scripts (again)
From: |
Ralf Wildenhues |
Subject: |
Re: [PATCH] Modernize, improve and/or fix various test scripts (again) |
Date: |
Sat, 12 Jun 2010 14:19:43 +0200 |
User-agent: |
Mutt/1.5.20 (2010-04-22) |
Hi Stefano,
* Stefano Lattarini wrote on Thu, Jun 10, 2010 at 12:43:41AM CEST:
> Again, this might seem huge, but most changes are trivial and/or
> similar one to the others.
> And having all these tweakings packed in a big lump should make their
> reviewing easier IMHO (at least, it shouldn't make it more difficult).
This is good for maint, thanks. I fixed the log entry typo
s/\(script\)\(.test\)/\1s\2/ .
> --- a/tests/strip.test
> +++ b/tests/strip.test
[...]
> @@ -18,12 +18,11 @@
>
> . ./defs || Exit 1
>
> -cat > configure.in << 'END'
> -AC_INIT(foo, 0.1, address@hidden)
> -AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
> +set -e
> +
> +cat >> configure.in << 'END'
> AC_PROG_CC
> -AM_CONDITIONAL(FOOTEST, false)
> -AC_CONFIG_FILES(Makefile)
> +AM_CONDITIONAL([FOOTEST], [false])
> AC_OUTPUT
> END
I really wondered what that conditional does in this test. I think it
is just a copy and paste leftover from pr279.test. Happened in a couple
other tests as well that were fixed nearby in time back then. I checked
that the PR's didn't deal with conditionals and committed the following
on top.
Cheers,
Ralf
Remove a couple of unneeded conditionals from tests.
* tests/pr243.test, tests/pr266.test, tests/strip.test: No need
for the FOOTEST conditional.
diff --git a/tests/pr243.test b/tests/pr243.test
index a3fdb8e..a5e869e 100755
--- a/tests/pr243.test
+++ b/tests/pr243.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2009, 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
@@ -22,7 +22,6 @@ cat > configure.in << 'END'
AC_INIT(foo, 0.1, address@hidden)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AC_PROG_CC
-AM_CONDITIONAL(FOOTEST, false)
AC_CONFIG_FILES(Makefile:Makefile.in:tail.mk)
AC_OUTPUT
END
diff --git a/tests/pr266.test b/tests/pr266.test
index 865369f..a1cd2fe 100755
--- a/tests/pr266.test
+++ b/tests/pr266.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2009, 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
@@ -22,7 +22,6 @@ cat > configure.in << 'END'
AC_INIT(foo, 0.1, address@hidden)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AC_PROG_CC
-AM_CONDITIONAL(FOOTEST, false)
AC_CONFIG_FILES(Maudefile)
AC_OUTPUT
END
diff --git a/tests/strip.test b/tests/strip.test
index a005a9a..12fe6b4 100755
--- a/tests/strip.test
+++ b/tests/strip.test
@@ -22,7 +22,6 @@ set -e
cat >> configure.in << 'END'
AC_PROG_CC
-AM_CONDITIONAL([FOOTEST], [false])
AC_OUTPUT
END