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/self-check-explicit-skips.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/self-check-explicit-skips.sh')
| -rwxr-xr-x | t/self-check-explicit-skips.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh index 602c31c3b..3e7a77c0a 100755 --- a/t/self-check-explicit-skips.sh +++ b/t/self-check-explicit-skips.sh @@ -24,9 +24,11 @@ test x"$sh_errexit_works" = x"yes" || skip_ "no working shell exit trap" # We still need a little hack to make ./defs work outside automake's # tree 'tests' subdirectory. Not a big deal. -sed "s|^testbuilddir=.*|testbuilddir='`pwd`'|" ../defs-static >defs-static -diff ../defs-static defs-static && Exit 99 -cp ../defs . +sed "s|^am_top_builddir=.*|am_top_builddir='`pwd`'|" \ + "$am_top_builddir"/defs-static > defs-static +diff "$am_top_builddir"/defs-static defs-static \ + && fatal_ "failed to edit defs-static" +cp "$am_top_builddir"/defs . set +e |