diff --git a/ChangeLog b/ChangeLog index 9fdaa5106..6114c949c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-02-10 Alexandre Duret-Lutz + + Enable VERBOSE logs for nips, greatspn, and python tests. + + * wrap/python/tests/run.in, iface/nips/nipstest/defs.in, + iface/gspn/defs.in: Do not disable VERBOSE when running from "make + check". Since we have started using parallel-check on 2009-08-31, + we should always send verbose output to the log. + 2011-02-10 Alexandre Duret-Lutz This should finally fix kv.test and dotty.test on the LIP6 buildfarm. diff --git a/iface/gspn/defs.in b/iface/gspn/defs.in index dc430a71c..c2dd7b4ec 100644 --- a/iface/gspn/defs.in +++ b/iface/gspn/defs.in @@ -6,9 +6,8 @@ test -f ./defs || { exit 1 } -# If srcdir is not set, then we are not running from `make check', be verbose. +# If srcdir is not set, then we are not running from `make check'. if test -z "$srcdir"; then - test -z "$VERBOSE" && VERBOSE=x # compute $srcdir. srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'` test $srcdir = $0 && srcdir=. diff --git a/iface/nips/nipstest/defs.in b/iface/nips/nipstest/defs.in index fde4a3574..b64c94cc3 100644 --- a/iface/nips/nipstest/defs.in +++ b/iface/nips/nipstest/defs.in @@ -1,7 +1,7 @@ # -*- shell-script -*- -# Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6), -# département Systèmes Répartis Coopératifs (SRC), Université Pierre -# et Marie Curie. +# Copyright (C) 2003, 2004, 2006, 2011 Laboratoire d'Informatique de +# Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), +# Université Pierre et Marie Curie. # # This file is part of Spot, a model checking library. # @@ -26,9 +26,8 @@ test -f ./defs || { exit 1 } -# If srcdir is not set, then we are not running from `make check', be verbose. +# If srcdir is not set, then we are not running from `make check'. if test -z "$srcdir"; then - test -z "$VERBOSE" && VERBOSE=x # compute $srcdir. srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'` test $srcdir = $0 && srcdir=. diff --git a/wrap/python/tests/run.in b/wrap/python/tests/run.in index c6a055569..1968a4ec1 100644 --- a/wrap/python/tests/run.in +++ b/wrap/python/tests/run.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2010 Laboratoire de Recherche et Developpement de +# Copyright (C) 2010, 2011 Laboratoire de Recherche et Developpement de # l'EPITA (LRDE). # Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 # (LIP6), département Systèmes Répartis Coopératifs (SRC), Université @@ -23,11 +23,6 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. - -# If we are running from make check (srcdir is set) and VERBOSE is -# unset, be quiet. -test -n "$srcdir" && test -z "$VERBOSE" && exec >/dev/null 2>&1 - # Darwin needs some help in figuring out where non-installed libtool # libraries are (on this platform libtool encodes the expected final # path of dependent libraries in each library).