X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fpylint.sh;h=f04f8ad870856e826cf6ba49fee91b5797989977;hb=ae3f7160d4ba37cf67d597a3d935aea55f553c17;hp=7c310294a8bc5617b945b7c1c67e90701bbaaa1d;hpb=f12f1d66b108047330ad7f7d6e611be3645925b4;p=lttng-ci.git

diff --git a/scripts/babeltrace/pylint.sh b/scripts/babeltrace/pylint.sh
old mode 100644
new mode 100755
index 7c31029..f04f8ad
--- a/scripts/babeltrace/pylint.sh
+++ b/scripts/babeltrace/pylint.sh
@@ -1,6 +1,7 @@
-#!/bin/sh -exu
+#!/bin/bash -exu
 #
-# Copyright (C) 2015 - Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2019 Francis Deslauriers <francis.deslauriers@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,22 +16,32 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-BABELTRACE_DIR="dependencies/babeltrace/build"
-BINDINGS_DIR="$BABELTRACE_DIR/lib/python3.4/dist-packages/babeltrace"
+set -o pipefail
+
+PYTHON3=python3
 
 PYENV_HOME="$WORKSPACE/.pyenv/"
 
 # Delete previously built virtualenv
-if [ -d $PYENV_HOME ]; then
-    rm -rf $PYENV_HOME
+if [ -d "$PYENV_HOME" ]; then
+    rm -rf "$PYENV_HOME"
 fi
 
 # Create virtualenv and install necessary packages
-virtualenv --system-site-packages -p python3 $PYENV_HOME
-. $PYENV_HOME/bin/activate
-pip install --quiet pylint
-pip install --quiet pep8
+virtualenv --system-site-packages -p ${PYTHON3} "$PYENV_HOME"
+
+set +ux
+. "$PYENV_HOME/bin/activate"
+set -ux
+
+pip install --quiet black
+pip install --quiet flake8
+
+exit_code=0
+
+cd src/babeltrace
 
-pep8 --exclude="nativebt.py" $BINDINGS_DIR | tee pep8.out
+black --diff --check . | tee ../../black.out || exit_code=1
+flake8 --output-file=../../flake8.out --tee || exit_code=1
 
-pylint -f parseable --ignore="nativebt.py" $BINDINGS_DIR | tee pylint.out
+exit $exit_code