Hash :
beef7a66
Author :
Date :
2011-02-01T09:52:43
dejagnu: allow the package developer to extend site.exp Fixes automake bug#7873. * lib/am/dejagnu.am (site.exp): Depend from the files listed in $(EXTRA_DEJAGNU_SITE_CONFIG), if any. Append their contents to the generated site.exp (still preserving user edits). * doc/automake.texi (Dejagnu Tests): Update. * tests/dejagnu-siteexp-append.test: New test. * tests/dejagnu-siteexp-extend.test: Likewise. * tests/dejagnu-siteexp-useredit.test: Likewise.รน * NEWS: Update. * tests/Makefile.am (TESTS): Update. Suggestion by Rainer Orth.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
#! /bin/sh
# Copyright (C) 2011 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 that the user can edit the Makefile-generated site.exp, and
# have its edits survive to the remaking of that file.
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
AC_OUTPUT
END
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
DEJATOOL = foo
END
# Deliberately select a variable defined automatically by
# the Makefile-generated site.exp.
mkdir foo.test
cat > foo.test/foo.exp << 'END'
send_user "objdir: $objdir\n"
set pipe "|"
if { $objdir == "${pipe}objdir${pipe}" } {
pass "test_obj"
} else {
fail "test_obj"
}
END
$ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing
./configure
$MAKE site.exp
echo 'set objdir "|objdir|"' >> site.exp
cat site.exp
$sleep
touch Makefile
$MAKE site.exp
cat site.exp
is_newest site.exp Makefile # Sanity check.
grep '|objdir|' site.exp
test `grep -c '|objdir|' site.exp` -eq 1
# We can done a "more semantic" check if DejaGnu is available.
if runtest SOMEPROGRAM=someprogram --version; then
$MAKE check
grep 'PASS: test_obj' foo.sum
fi
: