Commit b6ac86e0 authored by Iustin Pop's avatar Iustin Pop
Browse files

Merge branch 'devel-2.2' into devel-2.3


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents ca6c2dcd 577b170b
......@@ -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
......
......@@ -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" "$@"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment