[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-707-
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-707-g95b717e |
|
Date: |
Tue, 15 Feb 2011 09:22:43 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=95b717e8bd43406afc81bc5f6ebeef8b81da970c
The branch, master has been updated
via 95b717e8bd43406afc81bc5f6ebeef8b81da970c (commit)
via 5bf7af6e1e5fa63bc192ed972ef8c83dd6faec2b (commit)
via c0db5be20282013ce1697b8f2512223d75d3efb0 (commit)
via 1d77ab5edb701607bbea2b8a9ac27d8195ad3e6f (commit)
via 5cc6a5a3835fe98b23e4dae86ba7228f977e50a2 (commit)
from feac65b70b29c759b99ebdcba81f93b9450f401e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 95b717e8bd43406afc81bc5f6ebeef8b81da970c
Merge: c0db5be 5bf7af6
Author: Stefano Lattarini <address@hidden>
Date: Tue Feb 15 10:17:53 2011 +0100
Merge branch 'maint'
commit c0db5be20282013ce1697b8f2512223d75d3efb0
Author: Stefano Lattarini <address@hidden>
Date: Sun Nov 14 18:10:37 2010 +0100
tests: `instspc-*.test': do not create useless source file
* tests/instspc-tests.sh (create_input_data): Do not create
unused source file `source2.c'.
commit 1d77ab5edb701607bbea2b8a9ac27d8195ad3e6f
Author: Stefano Lattarini <address@hidden>
Date: Fri Nov 5 15:51:56 2010 +0100
tests: optimize `instspc-*.test' for speed
After the split of `instspc.test' into various generated tests,
the running time of the testsuite has noticeably increased, since
all these new generated tests must run aclocal, autoconf and
automake, whereas previously they were run only once (at the
beginning of `instspc.test'). But luckily, since the new tests
share the same input files for the autotools, this situation can
be easily worked around (at the expenses of a slight increase of
complexity for the testsuite scaffolding).
* tests/instspc-data.test: New helper test, properly calling
the `instspc-tests.sh' script to generate input data for the
others `instspc-*.test' tests.
* tests/Makefile.am (TESTS): Add `instspc-data.test'.
($(instspc_tests:.test=.log)): Depend on its log file.
(instspc-data.log): Depend on `instspc-tests.sh'.
* tests/instspc-tests.sh: Recognize new action `generate-data',
and use it to create hand-written and autotools-generated static
files shared by all the `instspc-*.test' tests.
When sourced by the `instspc-*.test' tests, use those previously
created files instead of recreating them from scratch.
(unindent, create_input_data): New subroutines.
Some other related changes and refactorings.
From a suggestion by Ralf Wildenhues.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 49 ++++++
THANKS | 2 +-
doc/automake.texi | 10 +-
m4/python.m4 | 2 +
tests/Makefile.am | 9 +-
tests/Makefile.in | 9 +-
tests/defs | 2 +-
tests/{help-regex.test => help-python.test} | 13 +-
tests/{acsubst.test => instspc-data.test} | 23 +--
tests/instspc-tests.sh | 232 ++++++++++++++++-----------
10 files changed, 226 insertions(+), 125 deletions(-)
copy tests/{help-regex.test => help-python.test} (77%)
copy tests/{acsubst.test => instspc-data.test} (62%)
diff --git a/ChangeLog b/ChangeLog
index 50c24fa..c3ff53b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2011-02-15 Stefano Lattarini <address@hidden>
+
+ python: report the 'PYTHON' influential environment variable
+ * m4/python.m4 (AM_PATH_PYTHON): Call AC_ARG_VAR on PYTHON.
+ * doc/automake.texi (Python): Update and extend.
+ * tests/help-python.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+ * THANKS (Jack Kelly): Update e-mail address.
+ Suggestion by Jack Kelly.
+
+2011-02-10 Stefano Lattarini <address@hidden>
+
+ tests defs: clear TESTS_ENVIRONMENT variable
+ * tests/defs.in (TESTS_ENVIRONMENT): Unset it, so that values
+ from environment won't interfere with the testcases.
+ Suggestion by Ralf Wildenhues.
+
+2011-02-15 Stefano Lattarini <address@hidden>
+
+ tests: `instspc-*.test': do not create useless source file
+ * tests/instspc-tests.sh (create_input_data): Do not create
+ unused source file `source2.c'.
+
+2011-02-15 Stefano Lattarini <address@hidden>
+
+ tests: optimize `instspc-*.test' for speed
+ After the split of `instspc.test' into various generated tests,
+ the running time of the testsuite has noticeably increased, since
+ all these new generated tests must run aclocal, autoconf and
+ automake, whereas previously they were run only once (at the
+ beginning of `instspc.test'). But luckily, since the new tests
+ share the same input files for the autotools, this situation can
+ be easily worked around (at the expenses of a slight increase of
+ complexity for the testsuite scaffolding).
+ * tests/instspc-data.test: New helper test, properly calling
+ the `instspc-tests.sh' script to generate input data for the
+ others `instspc-*.test' tests.
+ * tests/Makefile.am (TESTS): Add `instspc-data.test'.
+ ($(instspc_tests:.test=.log)): Depend on its log file.
+ (instspc-data.log): Depend on `instspc-tests.sh'.
+ * tests/instspc-tests.sh: Recognize new action `generate-data',
+ and use it to create hand-written and autotools-generated static
+ files shared by all the `instspc-*.test' tests.
+ When sourced by the `instspc-*.test' tests, use those previously
+ created files instead of recreating them from scratch.
+ (unindent, create_input_data): New subroutines.
+ Some other related changes and refactorings.
+ From a suggestion by Ralf Wildenhues.
+
2011-02-14 Stefano Lattarini <address@hidden>
python: fix spurious failure in tests
diff --git a/THANKS b/THANKS
index f53e7ee..a4cf675 100644
--- a/THANKS
+++ b/THANKS
@@ -135,7 +135,7 @@ Ian Lance Taylor address@hidden
ÐлÑÑ Ð. ÐолÑбев address@hidden
Imacat address@hidden
Inoue address@hidden
-Jack Kelly address@hidden
+Jack Kelly address@hidden
James Amundson address@hidden
James Henstridge address@hidden
James R. Van Zandt address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index b86b565..474f5a1 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7631,7 +7631,8 @@ files in your @file{Makefile.am}, depending on where you
want your files
installed (see the definitions of @code{pythondir} and
@code{pkgpythondir} below).
address@hidden AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found},
@ovar{action-if-not-found})
address@hidden AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found}, @
+ @ovar{action-if-not-found})
Search for a Python interpreter on the system. This macro takes three
optional arguments. The first argument, if present, is the minimum
@@ -7657,6 +7658,9 @@ If Python >= 2.5 was only @emph{optional} to the package,
AM_PATH_PYTHON([2.5],, [:])
@end example
+If the @env{PYTHON} variable is set when @code{AM_PATH_PYTHON} is
+called, then that will be the only Python interpreter that is tried.
+
@code{AM_PATH_PYTHON} creates the following output variables based on
the Python installation found during configuration.
@end defmac
@@ -7672,8 +7676,8 @@ to setup a conditional in order to disable the relevant
part of a build
as follows.
@example
- AM_PATH_PYTHON(,, [:])
- AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+AM_PATH_PYTHON(,, [:])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
@end example
@item PYTHON_VERSION
diff --git a/m4/python.m4 b/m4/python.m4
index c341d5c..2410436 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -40,6 +40,8 @@ AC_DEFUN([AM_PATH_PYTHON],
[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
+ AC_ARG_VAR([PYTHON], [the Python interpreter])
+
m4_if([$1],[],[
dnl No version check is needed.
# Find any Python interpreter.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2b5909d..e3eb9e9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -85,8 +85,11 @@ $(instspc_tests): Makefile.am
} > address@hidden
$(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
-# All instspc*.test tests work by sourcing the instspc-tests.sh script.
-$(instspc_tests:.test=.log): instspc-tests.sh
+# All instspc-*.test tests work by sourcing the `instspc-tests.sh'
+# script. Also, they all use shared data generated by the helper
+# test `instspc-data.test', for reasons of speed.
+instspc-data.log: instspc-tests.sh
+$(instspc_tests:.test=.log): instspc-tests.sh instspc-data.log
MAINTAINERCLEANFILES += $(instspc_tests)
EXTRA_DIST += instspc-tests.sh
@@ -469,6 +472,7 @@ help-init.test \
help-lispdir.test \
help-maintainer.test \
help-multilib.test \
+help-python.test \
help-regex.test \
help-silent.test \
help-upc.test \
@@ -507,6 +511,7 @@ instman2.test \
instmany.test \
instmany-mans.test \
instmany-python.test \
+instspc-data.test \
$(instspc_tests) \
interp.test \
interp2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1e903f4..1f367cd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -734,6 +734,7 @@ help-init.test \
help-lispdir.test \
help-maintainer.test \
help-multilib.test \
+help-python.test \
help-regex.test \
help-silent.test \
help-upc.test \
@@ -772,6 +773,7 @@ instman2.test \
instmany.test \
instmany-mans.test \
instmany-python.test \
+instspc-data.test \
$(instspc_tests) \
interp.test \
interp2.test \
@@ -1665,8 +1667,11 @@ $(instspc_tests): Makefile.am
} > address@hidden
$(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
-# All instspc*.test tests work by sourcing the instspc-tests.sh script.
-$(instspc_tests:.test=.log): instspc-tests.sh
+# All instspc-*.test tests work by sourcing the `instspc-tests.sh'
+# script. Also, they all use shared data generated by the helper
+# test `instspc-data.test', for reasons of speed.
+instspc-data.log: instspc-tests.sh
+$(instspc_tests:.test=.log): instspc-tests.sh instspc-data.log
# Each test case depends on defs, aclocal, and automake.
$(TEST_LOGS): defs aclocal-$(APIVERSION) automake-$(APIVERSION)
diff --git a/tests/defs b/tests/defs
index 650ad8f..4e27788 100644
--- a/tests/defs
+++ b/tests/defs
@@ -87,6 +87,7 @@ unset srcdir
# conceptually independent, they cause some changed semantics we
# need to control (and test for) in some of the tests to ensure
# backward-compatible behavior.
+unset TESTS_ENVIRONMENT
unset DISABLE_HARD_ERRORS
unset TESTS
unset TEST_LOG_COMPILER
@@ -492,7 +493,6 @@ done
echo "AC_CONFIG_FILES([Makefile])"
} >configure.in
-
## ---------------- ##
## Ready to go... ##
## ---------------- ##
diff --git a/tests/help-regex.test b/tests/help-python.test
similarity index 77%
copy from tests/help-regex.test
copy to tests/help-python.test
index aecfed9..ba20013 100755
--- a/tests/help-regex.test
+++ b/tests/help-python.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# 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
@@ -14,14 +14,16 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure that obsolescent macro `AM_WITH_REGEX' adds proper text to
-# the configure help screen.
+# Make sure that macro `AM_PATH_PYTHON' adds proper text to the
+# configure help screen.
. ./defs || Exit 1
+set -e
+
cat > configure.in <<END
AC_INIT([$me], [1.0])
-AM_WITH_REGEX
+AM_PATH_PYTHON
END
$ACLOCAL
@@ -30,7 +32,6 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-$FGREP ' --without-regex ' stdout
-$FGREP ' use GNU rx ' stdout
+grep '^ *PYTHON *the Python interpreter$' stdout
:
diff --git a/tests/acsubst.test b/tests/instspc-data.test
similarity index 62%
copy from tests/acsubst.test
copy to tests/instspc-data.test
index a02b34c..1c165d8 100755
--- a/tests/acsubst.test
+++ b/tests/instspc-data.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# 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
@@ -14,18 +14,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-. ./defs || Exit 1
+# Helper testcase which generate input data for the other test
+# `instspc-*.test'. It basically delegates the work to the helper
+# script `instspc-test.sh'.
-cat >> configure.in << 'END'
-AC_PROG_CC
-AC_SUBST([FOOBAR_LDFLAGS],[blablabla])
-END
+# Ensure proper definition of $testsrcdir.
+. ./defs-static || exit 99
+test -n "$testsrcdir" || exit 99 # sanity check
-cat > Makefile.am << 'END'
-bin_PROGRAMS = mumble
-mumble_SOURCES = a.c b.c d.h
-mumble_LDFLAGS = $(FOOBAR_LDFLAGS)
-END
-
-$ACLOCAL
-$AUTOMAKE -a
+instspc_action=generate-data
+. $testsrcdir/instspc-tests.sh
diff --git a/tests/instspc-tests.sh b/tests/instspc-tests.sh
index 1be8d0e..981365f 100755
--- a/tests/instspc-tests.sh
+++ b/tests/instspc-tests.sh
@@ -21,18 +21,21 @@
# Original report from James Amundson about file names with spaces.
# Other characters added by Paul Eggert.
#
-# This script fulfills a double role:
+# This script fulfills a threefold role:
# 1. It generates a Makefile.am snippet, containing the definition
# of proper lists of tests.
-# 2. It is sourced by said generated tests with proper parameters
+# 2. It sets up a directory containing some common data files and
+# autotools-generated files used by said generated tests (this
+# is done for speed reasons only).
+# 3. It is sourced by said generated tests with proper parameters
# pre-set, to run the "meat" of the checks.
-# This setup might seem tricky and over-engineered abuse, but past
+# This setup might seem a tricky and over-engineered abuse, but past
# (painful) experiences showed that it is indeed required, because
# the test generation code and test execution code tend to be
# inextricably coupled and intertwined.
#
-# Be more Bourne compatible (snippet copied from `tests/defs.in').
+# Be more Bourne compatible (snippet copied from `tests/defs').
DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
@@ -58,21 +61,23 @@ if test x"$instspc_action" = x; then
elif test $# -gt 0; then
echo "$0: action specified and command line arguments used" >&2
exit 99
-elif test x"$instspc_action" = x"generate-makefile"; then
- :
-else
- case $instspc_action in
- test-build|test-install)
- if test x"$instspc_test_name" = x; then
- echo "$0: test name undefined for action '$instspc_action'" >&2
- exit 99
- fi;;
- *)
- echo "$0: invalid action: '$instspc_action'"
- exit 99;;
- esac
fi
+case $instspc_action in
+ generate-makefile|generate-data)
+ ;;
+ test-build|test-install)
+ if test x"$instspc_test_name" = x; then
+ echo "$0: test name undefined for action '$instspc_action'" >&2
+ exit 99
+ fi
+ ;;
+ *)
+ echo "$0: invalid action: '$instspc_action'"
+ exit 99
+ ;;
+esac
+
# Helper subroutine for test data definition.
# Usage: define_problematic_string NAME STRING
define_problematic_string ()
@@ -94,6 +99,90 @@ define_problematic_string ()
esac
}
+# Helper subroutines for creation of input data files.
+
+unindent ()
+{
+ sed 's/^ *//' # we don't strip leading tabs -- this is deliberate!
+}
+
+create_input_data ()
+{
+ mkdir sub
+
+ unindent > configure.in << 'EOF'
+ AC_INIT([instspc], [1.0])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_FILES([Makefile])
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_OUTPUT
+EOF
+
+ : > sub/base.h
+ : > sub/nobase.h
+ : > sub/base.dat
+ : > sub/nobase.dat
+ : > sub/base.sh
+ : > sub/nobase.sh
+
+ unindent > source.c << 'EOF'
+ int
+ main (int argc, char **argv)
+ {
+ return 0;
+ }
+EOF
+
+ unindent > Makefile.am << 'EOF'
+ foodir = $(prefix)/foo
+ fooexecdir = $(prefix)/foo
+
+ foo_HEADERS = sub/base.h
+ nobase_foo_HEADERS = sub/nobase.h
+
+ dist_foo_DATA = sub/base.dat
+ nobase_dist_foo_DATA = sub/nobase.dat
+
+ dist_fooexec_SCRIPTS = sub/base.sh
+ nobase_dist_fooexec_SCRIPTS = sub/nobase.sh
+
+ fooexec_PROGRAMS = sub/base
+ nobase_fooexec_PROGRAMS = sub/nobase
+ sub_base_SOURCES = source.c
+ sub_nobase_SOURCES = source.c
+
+ fooexec_LIBRARIES = sub/libbase.a
+ nobase_fooexec_LIBRARIES = sub/libnobase.a
+ sub_libbase_a_SOURCES = source.c
+ sub_libnobase_a_SOURCES = source.c
+
+ .PHONY: test-install-sep
+ test-install-sep: install
+ test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.h'
+ test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.h'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/base.h'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.dat'
+ test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.dat'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/base.dat'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.sh'
+ test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.sh'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/base.sh'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase$(EXEEXT)'
+ test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase$(EXEEXT)'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/base$(EXEEXT)'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/sub/libnobase.a'
+ test ! -f '$(DESTDIR)/$(file)-prefix/foo/libnobase.a'
+ test -f '$(DESTDIR)/$(file)-prefix/foo/libbase.a'
+EOF
+
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+
+ : > success
+}
+
# Be sure to avoid interferences from the environment.
instspc_names_list=''
instspc_xfail_builds_list=''
@@ -189,102 +278,54 @@ if test x"$instspc_action" = x"generate-makefile"; then
exit 0
fi
-### If we are still here, we have to run a test ...
-
-# We'll need the full setup provided by `tests/defs'. Temporarly disable
+# We'll need the full setup provided by `tests/defs'. Temporarily disable
# the errexit flag, since the setup code might not be prepared to deal
# with it.
set +e
. ./defs || Exit 99
set -e
+# The directory set up by the `generate-data' action should contain all
+# the files we need. So remove the other files created by ./defs. And
+# check we really are in a temporary `*.dir' directory in the build tree,
+# since the last thing we want is to remove some random user files!
+test -f ../defs-static && test -f ../defs || Exit 99
+case `pwd` in *.dir);; *) Exit 99;; esac
+rm -f *
+
+if test x"$instspc_action" = x"generate-data"; then
+ # We must *not* remove the test directory, since its contents must be
+ # used by following dependent tests.
+ keep_testdirs=yes
+ create_input_data
+ Exit 0
+fi
+
+### If we are still here, we have to run a test ...
+
eval "instspc_test_string=\${instspc__$instspc_test_name}" || Exit 99
if test x"$instspc_test_string" = x; then
echo "$me: invalid test name: '$instspc_test_name'" >&2
Exit 99
fi
-# Skip if this system doesn't support these characters in file names.
-mkdir "./$instspc_test_string" || Exit 77
-
-mkdir sub sub1
-
-cat >> configure.in << 'EOF'
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_OUTPUT
-EOF
-
-: > sub/base.h
-: > sub/nobase.h
-: > sub/base.dat
-: > sub/nobase.dat
-: > sub/base.sh
-: > sub/nobase.sh
-
-cat > source.c << 'EOF'
-int
-main (int argc, char **argv)
-{
- return 0;
+test -f ../instspc-data.dir/success || {
+ echo "$me: setup by instspc-data.test failed" >&2
+ Exit 99
}
-EOF
-cp source.c source2.c
-
-cat > Makefile.am << 'EOF'
-foodir = $(prefix)/foo
-fooexecdir = $(prefix)/foo
-
-foo_HEADERS = sub/base.h
-nobase_foo_HEADERS = sub/nobase.h
-
-dist_foo_DATA = sub/base.dat
-nobase_dist_foo_DATA = sub/nobase.dat
-
-dist_fooexec_SCRIPTS = sub/base.sh
-nobase_dist_fooexec_SCRIPTS = sub/nobase.sh
-
-fooexec_PROGRAMS = sub/base
-nobase_fooexec_PROGRAMS = sub/nobase
-sub_base_SOURCES = source.c
-sub_nobase_SOURCES = source.c
-fooexec_LIBRARIES = sub/libbase.a
-nobase_fooexec_LIBRARIES = sub/libnobase.a
-sub_libbase_a_SOURCES = source.c
-sub_libnobase_a_SOURCES = source.c
-
-.PHONY: test-install-sep
-test-install-sep: install
- test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.h'
- test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.h'
- test -f '$(DESTDIR)/$(file)-prefix/foo/base.h'
- test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.dat'
- test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.dat'
- test -f '$(DESTDIR)/$(file)-prefix/foo/base.dat'
- test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase.sh'
- test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase.sh'
- test -f '$(DESTDIR)/$(file)-prefix/foo/base.sh'
- test -f '$(DESTDIR)/$(file)-prefix/foo/sub/nobase$(EXEEXT)'
- test ! -f '$(DESTDIR)/$(file)-prefix/foo/nobase$(EXEEXT)'
- test -f '$(DESTDIR)/$(file)-prefix/foo/base$(EXEEXT)'
- test -f '$(DESTDIR)/$(file)-prefix/foo/sub/libnobase.a'
- test ! -f '$(DESTDIR)/$(file)-prefix/foo/libnobase.a'
- test -f '$(DESTDIR)/$(file)-prefix/foo/libbase.a'
-EOF
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
+# Skip if this system doesn't support these characters in file names.
+mkdir "./$instspc_test_string" || Exit 77
case $instspc_action in
test-build)
- build=$instspc_test_string
- dest=`pwd`/sub1
+ dest=`pwd`/_dest
+ relbuilddir=../..
+ cd "./$instspc_test_string"
;;
test-install)
- build=sub1
dest=`pwd`/$instspc_test_string
+ relbuilddir=..
;;
*)
echo "$me: internal error: invalid action '$instspc_action'"
@@ -292,9 +333,8 @@ case $instspc_action in
;;
esac
-cd "./$build"
-
-../configure --prefix "/$instspc_test_string-prefix"
+$relbuilddir/instspc-data.dir/configure \
+ --prefix "/$instspc_test_string-prefix"
$MAKE
# Some make implementations eliminate leading and trailing whitespace
# from macros passed on the command line, and some eliminate leading
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-707-g95b717e,
Stefano Lattarini <=