tests: tweak tests on obsolete EXTRA_DATA variable

* t/extra3.sh, t/extra4.sh: Merge ....
* t/extra-data.sh: ... into this, with updated comments.
* t/list-of-tests.mk: Adjust.  Also Tweak the order in
which some other tests are listed.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/t/extra3.sh b/t/extra-data.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 73%
rename from t/extra3.sh
rename to t/extra-data.sh
index 4fc4d3f..cded2a3
--- a/t/extra3.sh
+++ b/t/extra-data.sh
@@ -14,15 +14,20 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check to make sure EXTRA_DATA not required.
+# Checks on the obsolete EXTRA_DATA variable.
 
 . test-init.sh
 
-echo 'AC_SUBST(CODICIL)' >> configure.ac
-
-cat > Makefile.am << 'END'
-sysconf_DATA = @CODICIL@
-END
+echo 'AC_SUBST([CODICIL])' >> configure.ac
 
 $ACLOCAL
+
+# EXTRA_DATA is not required ....
+echo sysconf_DATA = @CODICIL@ > Makefile.am
 $AUTOMAKE
+
+# ... but it can nonetheless be specified.
+echo EXTRA_DATA = codicil.txt >> Makefile.am
+$AUTOMAKE
+
+:

diff --git a/t/extra4.sh b/t/extra4.sh
deleted file mode 100755 (executable)
index 2d21b4f..0000000
--- a/t/extra4.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998-2013 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
-# the Free Software Foundation; either version 2, 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
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# 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, see <http://www.gnu.org/licenses/>.
-
-# Check to make sure EXTRA_DATA can be specified.
-
-. test-init.sh
-
-echo 'AC_SUBST(CODICIL)' >> configure.ac
-
-cat > Makefile.am << 'END'
-sysconf_DATA = @CODICIL@
-EXTRA_DATA = codicil.txt
-END
-
-$ACLOCAL
-$AUTOMAKE

diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 7b44e07..ba96774 100644 (file)
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -441,16 +441,15 @@ t/ext2.sh \
 t/ext3.sh \
 t/extra.sh \
 t/extra2.sh \
-t/extra3.sh \
-t/extra4.sh \
+t/extra-data.sh \
 t/extra-dist-vpath-dir.sh \
 t/extra-dist-dirs-and-subdirs.sh \
 t/extra-dist-vpath-dir-merge.sh \
-t/extra-programs-misc.sh \
-t/extra-programs-and-libs.sh \
 t/extra-dist-wildcards.sh \
 t/extra-dist-wildcards-gnu.sh \
 t/extra-dist-wildcards-vpath.sh \
+t/extra-programs-misc.sh \
+t/extra-programs-and-libs.sh \
 t/extra-programs-empty.sh \
 t/extra-portability.sh \
 t/extra-portability2.sh \