diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-06 15:20:54 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-06 21:29:31 +0200 |
| commit | 8e02441b00db75f21455edc92191e64cab19b031 (patch) | |
| tree | 66d045b7a857d169f5d83be0a5ac526fad5102a8 /t/get-sysconf.sh | |
| parent | 8a5096d150cf9803b8963768b7366cd68edcce03 (diff) | |
| download | automake-8e02441b00db75f21455edc92191e64cab19b031.tar.gz | |
maint: no more make recursion in Automake's build system
We finally merge testsuite-related part of the Automake build
system with the top-level one. See also yesterday's commit
'v1.11-2124-ga4b0f4b', "maint: remove most recursion in automake's
own build system".
* t/gen-testsuite-part: Move ...
* gen-testsuite-part: ... here, with required adjustments.
* t/defs-static.in: Move ...
* defs-static.in: ... here, with required adjustments. In
particular ...
($testsrcdir, $testbuilddir): Removed.
($top_testsrcdir): Renamed ...
($am_top_srcdir): ... to this.
($top_testbuilddir): Renamed ...
($am_top_builddir): ... to this.
* t/defs: Move ...
* defs: ... here, and adjust as required.
* t/Makefile.am: Merge ...
* Makefile.am: ... in here, with related adjustments and
simplifications.
* bootstrap: Adjust as required.
* syntax-checks.mk: Likewise.
* .gitignore: Likewise.
* t/ax/tap-setup.sh: Likewise.
* t/get-sysconf.sh: Likewise.
* t/help-multilib.sh: Likewise.
* t/multlib.sh: Likewise.
* t/parallel-tests2.sh: Likewise.
* t/self-check-cleanup.tap: Likewise.
* t/self-check-exit.tap: Likewise.
* t/self-check-dir.tap: Likewise.
* t/self-check-explicit-skips.sh: Likewise.
* t/self-check-reexec.tap: Likewise.
* t/self-check-sanity.sh: Likewise.
* t/yacc-d-cxx.sh: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/get-sysconf.sh')
| -rwxr-xr-x | t/get-sysconf.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh index ae3310e5d..ac09a6324 100755 --- a/t/get-sysconf.sh +++ b/t/get-sysconf.sh @@ -23,17 +23,17 @@ . ./defs || Exit 1 st=0 -if test -d "$top_testsrcdir"/.git; then +if test -d "$am_top_srcdir"/.git; then # We are running from a git checkout. - (cd "$top_testsrcdir" && git log -1) || st=1 -elif test -f "$top_testsrcdir"/ChangeLog; then + (cd "$am_top_srcdir" && git log -1) || st=1 +elif test -f "$am_top_srcdir"/ChangeLog; then # We are probably running from a distribution tarball. awk ' BEGIN { first = 1 } (first == 1) { print; first = 0; next; } /^[^\t]/ { exit(0); } { print } - ' "$top_testsrcdir"/ChangeLog || st=1 + ' "$am_top_srcdir"/ChangeLog || st=1 else # Some non-common but possibly valid setup (see for example the Homebrew # problem reported in automake bug#10866); so just give an harmless @@ -46,9 +46,9 @@ $PERL -V || st=1 # happen with older perl installation, or on MinGW/MSYS. $PERL -e 'use TAP::Parser; print $TAP::Parser::VERSION, "\n"' || : -cat "$top_testbuilddir/config.log" || st=1 -cat "$testbuilddir/wrap/aclocal-$APIVERSION" || st=1 -cat "$testbuilddir/wrap/automake-$APIVERSION" || st=1 +cat "$am_top_builddir/config.log" || st=1 +cat "$am_top_builddir/t/wrap/aclocal-$APIVERSION" || st=1 +cat "$am_top_builddir/t/wrap/automake-$APIVERSION" || st=1 if test $st -eq 0; then # This test SKIPs, so that all the information it has gathered and |