aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-03-31 02:58:05 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-03-31 02:58:05 +0000
commitb7fc60b6fa38c3c7705835a9b8e3182e5362cb2c (patch)
tree7bbb3d8df2f366614d84a87af9c8e4f4f77d7c43
parentf9f8c7f89f0adbfb1d31292345e6e33a8ea53718 (diff)
downloadpaludis-b7fc60b6fa38c3c7705835a9b8e3182e5362cb2c.tar.gz
paludis-b7fc60b6fa38c3c7705835a9b8e3182e5362cb2c.tar.xz
emake shouldn't die itself. Make default src_test more verbose.
-rw-r--r--ebuild/build_functions.bash2
-rw-r--r--ebuild/src_test.bash11
2 files changed, 10 insertions, 3 deletions
diff --git a/ebuild/build_functions.bash b/ebuild/build_functions.bash
index 77d87bb..67f53fd 100644
--- a/ebuild/build_functions.bash
+++ b/ebuild/build_functions.bash
@@ -64,7 +64,7 @@ emake()
{
cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} $@"
echo "${cmd}"
- ${cmd} || die "emake failed"
+ ${cmd}
}
einstall()
diff --git a/ebuild/src_test.bash b/ebuild/src_test.bash
index 532c65c..f99f012 100644
--- a/ebuild/src_test.bash
+++ b/ebuild/src_test.bash
@@ -24,11 +24,18 @@
src_test()
{
if [[ -f Makefile ]] ; then
- if emake -j1 -n check &>/dev/null ; then
+ echo "Makefile found, looking for potential test targets"
+ if emake -j1 -n check ; then
+ echo "Found check target"
emake -j1 check || die "make check failed"
- elif emake -j1 -n test &>/dev/null ; then
+ elif emake -j1 -n test ; then
+ echo "Found test target"
emake -j1 test || die "make test failed"
+ else
+ echo "No check or test target, skipping tests"
fi
+ else
+ echo "No Makefile, skipping tests"
fi
}