Skip to content
Permalink
Browse files

Move xvfb-run conditional to Makefile

  • Loading branch information...
crwood committed Apr 24, 2019
1 parent 87d1875 commit 3b9dfee4530d4056e06f364c4272f11b235bfef0
Showing with 6 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +4 −0 Makefile
  3. +1 −3 tox.ini
@@ -57,7 +57,7 @@ install:
- python2 -m pip install --upgrade setuptools pip
- python3 -m pip install --upgrade setuptools pip tox coveralls
script:
- python3 -m tox
- make test
- make all
- dist/Tahoe-LAFS/tahoe --version-and-path
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then xvfb-run -a dist/Gridsync/gridsync --version; fi
@@ -17,6 +17,10 @@ clean:

test:
python3 -m tox
@case `uname` in \
Darwin) $(MAKE) python3 -m tox ;; \
*) xvfb-run -a python3 -m tox ;; \
esac

pngs:
mkdir -p build/frames
@@ -11,7 +11,6 @@ platform =
deps =
-r{toxinidir}/requirements/requirements-gridsync.txt
-r{toxinidir}/requirements/requirements-pytest.txt
whitelist_externals = xvfb-run
commands =
pyqt57: python -m pip install PyQt5==5.7.1
pyqt58: python -m pip install PyQt5==5.8.2
@@ -20,8 +19,7 @@ commands =
pyqt511: python -m pip install PyQt5==5.11.2
python scripts/maybe_rebuild_libsodium.py
python scripts/maybe_downgrade_pyqt.py
linux: xvfb-run -a python -m pytest
{mac,windows}: python -m pytest
python -m pytest
passenv = APPDATA CI GNOME_DESKTOP_SESSION_ID


0 comments on commit 3b9dfee

Please sign in to comment.
You can’t perform that action at this time.