Merge branch 'devel-2.2' into devel-2.3

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

autotools/gen-coverage

@@ -24,10 +24,12 @@ set -e
 : ${PYTHON:=python}
 : ${COVERAGE_FILE:?}
 : ${TEXT_COVERAGE:?}
+: ${GANETI_TEMP_DIR:?}
 
-omit=$($PYTHON -c 'import sys;
-print " ".join(["--omit=%s/" % i for i in
-                set([sys.prefix, sys.exec_prefix])])')
+omit=$($PYTHON -c 'import sys; import os;
+print ",".join("%s/" % i for i in set([sys.prefix, sys.exec_prefix,
+   os.environ["GANETI_TEMP_DIR"] + "/test"]))')
+omit="--omit=$omit"
 
 $COVERAGE erase
 

autotools/run-in-tempdir

@@ -8,4 +8,4 @@ trap "rm -rf $tmpdir" EXIT
 cp -r daemons scripts lib tools test $tmpdir
 mv $tmpdir/lib $tmpdir/ganeti
 
-cd $tmpdir && "$@"
+cd $tmpdir && GANETI_TEMP_DIR="$tmpdir" "$@"