aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskullY <skullydazed@gmail.com>2019-08-29 12:24:27 -0700
committerskullydazed <skullydazed@users.noreply.github.com>2019-09-07 07:58:41 -0700
commit1013ae2d34dc34e0e7d63fe875e70801ded3673c (patch)
treec179a05c8cbdc9b7d1a1ce9d3d6af14379bd740c
parentdeb6fa6a87b12fcdbf577837c6faeb854cd287c7 (diff)
downloadqmk_firmware-1013ae2d34dc34e0e7d63fe875e70801ded3673c.tar.gz
qmk_firmware-1013ae2d34dc34e0e7d63fe875e70801ded3673c.zip
Add python tests to the travis check
-rwxr-xr-xutil/travis_build.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh
index fd5511a72..3fff768f6 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -22,7 +22,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
22 eval $MAKE_ALL 22 eval $MAKE_ALL
23 : $((exit_code = $exit_code + $?)) 23 : $((exit_code = $exit_code + $?))
24 else 24 else
25 NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) 25 NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l)
26 BRANCH=$(git rev-parse --abbrev-ref HEAD) 26 BRANCH=$(git rev-parse --abbrev-ref HEAD)
27 # is this branch master or a "non docs, non keyboards" change 27 # is this branch master or a "non docs, non keyboards" change
28 if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then 28 if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
@@ -51,6 +51,14 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
51 fi 51 fi
52 done 52 done
53 fi 53 fi
54 # Check and run python tests if necessary
55 PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E '^(lib/python/)' | wc -l)
56 if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
57 echo
58 echo "Running python tests."
59 bin/qmk nose2
60 : $((exit_code = $exit_code + $?))
61 fi
54 fi 62 fi
55 exit $exit_code 63 exit $exit_code
56fi 64fi