summaryrefslogtreecommitdiffstats
path: root/util/travis_build.sh
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-10-14 17:57:53 +0100
committerGitHub <noreply@github.com>2019-10-14 17:57:53 +0100
commite1de0d74a6f6c4bdc762b32fb78e449aed0fcecb (patch)
tree677c27ec4e19b5a2c398ce66fa7885765377f957 /util/travis_build.sh
parent6560dffc05131c05655f8e0d74cc65c5918894fa (diff)
Move running pytest to travis_test (#7005)
Diffstat (limited to 'util/travis_build.sh')
-rwxr-xr-xutil/travis_build.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 2bc1ccd62f..225c8548f5 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# if docker is installed - call make within the qmk docker image
+# if docker is installed - patch calls to within the qmk docker image
if command -v docker >/dev/null; then
function make() {
docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
@@ -52,14 +52,6 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
fi
done
fi
- # Check and run python tests if necessary
- PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E -e '^(lib/python/)' -e '^(bin/qmk)' | wc -l)
- if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
- echo
- echo "Running python tests."
- docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container 'bin/qmk pytest'
- : $((exit_code = $exit_code + $?))
- fi
fi
exit $exit_code
fi