diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-23 21:33:03 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-23 21:43:32 +0200 |
| commit | b757a99bd3c2d77c319bb7876f0ad324ac3b93a9 (patch) | |
| tree | 229b2ded9b652a8bffb3fc88f9b973d322e50d60 /t/instdir-prog.sh | |
| parent | ac3a5a12598bb44a6c748964d2ed46eb899dbc04 (diff) | |
| parent | a0db09fe9eb8b03415a5dd00ff031f5a17096108 (diff) | |
| download | automake-b757a99bd3c2d77c319bb7876f0ad324ac3b93a9.tar.gz | |
Merge branch 'master' into ng/master
* master:
tests: avoid few lingering $MAKE redirections
tests: avoid '$MAKE' redirections, use 'run_make' instead
tests: avoid use of redirected 'run_make' invocations
lint: warn against redirected 'run_make' invocations
comments: next GNU make release 4.0, not 3.83
tests: fix a potential spurious failure due to global config.site
HACKING: it's OK to do testsuite refactoring in a micro version
tests: remove some code duplication
cosmetics: remove a couple of extra whitespaces in tests
tests: two minor fixups
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/instdir-prog.sh')
| -rw-r--r-- | t/instdir-prog.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh index 99b2d2bf6..77961eca2 100644 --- a/t/instdir-prog.sh +++ b/t/instdir-prog.sh @@ -65,19 +65,7 @@ cd build am_cv_python_pythondir="$instdir/python" \ am_cv_python_pyexecdir="$instdir/pyexec" -nukedirs='bindir= libdir= pyexecdir=' - -run_make $nukedirs install -test ! -e "$instdir" -run_make $nukedirs install DESTDIR="$destdir" -test ! -e "$instdir" -test ! -e "$destdir" -run_make $nukedirs uninstall > stdout \ - || { cat stdout; exit 1; } -cat stdout -# Creative quoting below to please maintainer-check. -grep 'rm'' ' stdout && exit 1 -run_make $nukedirs uninstall DESTDIR="$destdir" > stdout \ - || { cat stdout; exit 1; } +nulldirs='bindir= libdir= pyexecdir=' +null_install : |