From edbf3610ce57e51a07a3191cb4d436cdc0c3d4a2 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 6 Oct 2011 15:00:37 +0200 Subject: [PATCH] tests: avoid few useless uses of the `-e' make option * tests/python12.test: Using `make -e' is not required to override the DESTDIR variable, since this variable shouldn't be defined in any automake-generated Makefile.in file. * tests/man2.test: Likewise. * tests/man5.test: Likewise. --- ChangeLog | 9 +++++++++ tests/man2.test | 4 ++-- tests/man5.test | 4 ++-- tests/python12.test | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e6783efa..686a30d31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-10-06 Stefano Lattarini + + tests: avoid few useless uses of the `-e' make option + * tests/python12.test: Using `make -e' is not required to override + the DESTDIR variable, since this variable shouldn't be defined in + any automake-generated Makefile.in file. + * tests/man2.test: Likewise. + * tests/man5.test: Likewise. + 2011-10-06 Stefano Lattarini fix: make a test script executable diff --git a/tests/man2.test b/tests/man2.test index a4d181569..6777f9711 100755 --- a/tests/man2.test +++ b/tests/man2.test @@ -39,13 +39,13 @@ $AUTOMAKE # Let's play with $DESTDIR too, it shouldn't hurt. ./configure --prefix='' --mandir=/man -DESTDIR="`pwd`/_inst" $MAKE -e install +$MAKE DESTDIR="`pwd`/_inst" install test -f ./_inst/man/man2/foo.2 test -f ./_inst/man/man4/foo.4 test -f ./_inst/man/man4/bar.4 -DESTDIR="`pwd`/_inst" $MAKE -e uninstall +$MAKE DESTDIR="`pwd`/_inst" uninstall test ! -f ./_inst/man/man2/foo.2 test ! -f ./_inst/man/man4/foo.4 diff --git a/tests/man5.test b/tests/man5.test index 28bcff064..955442e11 100755 --- a/tests/man5.test +++ b/tests/man5.test @@ -42,7 +42,7 @@ $AUTOMAKE # Let's play with $DESTDIR too, it shouldn't hurt. ./configure --mandir=/man -DESTDIR="`pwd`/_inst" $MAKE -e install +$MAKE DESTDIR="`pwd`/_inst" install test -f ./_inst/man/man2/foo.2 test -f ./_inst/man/man2/nfoo.2 @@ -55,7 +55,7 @@ test ! -d ./_inst/man/man1 test ! -d ./_inst/man/man4 test ! -d ./_inst/man/man5 -DESTDIR="`pwd`/_inst" $MAKE -e uninstall +$MAKE DESTDIR="`pwd`/_inst" uninstall test ! -f ./_inst/man/man2/foo.2 test ! -f ./_inst/man/man2/nfoo.2 diff --git a/tests/python12.test b/tests/python12.test index 1ff9b4a13..378a0dc82 100755 --- a/tests/python12.test +++ b/tests/python12.test @@ -42,7 +42,7 @@ instdir=`pwd`/inst mkdir build cd build ../configure --prefix="/usr" -DESTDIR=$instdir $MAKE -e install +$MAKE install DESTDIR=$instdir # Perfunctory test that the files were created. test -f "$instdir/usr/share/my/my.py" -- 2.47.2