]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Run the python tests inside docker
authorskullY <skullydazed@gmail.com>
Thu, 29 Aug 2019 20:05:11 +0000 (13:05 -0700)
committerskullydazed <skullydazed@users.noreply.github.com>
Sat, 7 Sep 2019 14:58:41 +0000 (07:58 -0700)
util/travis_build.sh

index 9ea0c5c4b951ca4393ab92e2f414d1a936e7bc41..605b6d5f053355bc1449c18fbdbf4029f4bf81fb 100755 (executable)
@@ -2,9 +2,9 @@
 
 # if docker is installed - call make 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 "$@"
-  }
+       function make() {
+               docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
+       }
 fi
 
 # test force push
@@ -30,7 +30,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
                        eval $MAKE_ALL
                        : $((exit_code = $exit_code + $?))
                else
-                   # keyboards project format
+                       # keyboards project format
                        #  /keyboards/board1/rev/keymaps/
                        #  /keyboards/board2/keymaps/
                        # ensure we strip everything off after and including the keymaps folder to get board and/or revision
@@ -56,7 +56,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
                if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
                        echo
                        echo "Running python tests."
-                       bin/qmk nose2
+                       docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk nose2
                        : $((exit_code = $exit_code + $?))
                fi
        fi