summaryrefslogtreecommitdiffstats
path: root/ci/merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/merge.sh')
-rwxr-xr-xci/merge.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/ci/merge.sh b/ci/merge.sh
index bd1d3fe..337fc55 100755
--- a/ci/merge.sh
+++ b/ci/merge.sh
@@ -8,4 +8,12 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-PYTHONPATH="`pwd`/storperf":"`pwd`/tests" nosetests --with-xunit .
+if [ -x /usr/bin/flake8 ]; then
+ flake8 storperf
+fi
+
+nosetests --with-xunit \
+ --with-coverage \
+ --cover-package=storperf\
+ --cover-xml \
+ storperf