Revert pinning of Twisted 15.2.0 which causes more problems than it solves.

[tahoe-lafs/tahoe-lafs.git] / Makefile

diff --git a/Makefile b/Makefile
index 6df6bd6adf0b48358e7a45d35f4542462dbcf573..b67f47335ce0a52902fc05ee205dbd9eaf91e41e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@ default: build
 
 PYTHON=python
 export PYTHON
+PYFLAKES=pyflakes
+export PYFLAKES
 
 # setup.py will extend sys.path to include our support/lib/... directory
 # itself. It will also create it in the beginning of the 'develop' command.
@@ -83,6 +85,11 @@ _tmpfstest: make-version
        sudo umount '$(TMPDIR)'
        rmdir '$(TMPDIR)'
 
+.PHONY: smoketest
+smoketest:
+       -python ./src/allmydata/test/check_magicfolder_smoke.py kill
+       -rm -rf smoke_magicfolder/
+       python ./src/allmydata/test/check_magicfolder_smoke.py
 
 # code coverage: install the "coverage" package from PyPI, do "make test-coverage" to
 # do a unit test run with coverage-gathering enabled, then use "make coverage-output" to
@@ -132,7 +139,7 @@ check-miscaptures:
 
 .PHONY: pyflakes
 pyflakes:
-       @$(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+       $(PYFLAKES) $(SOURCES) |sort |uniq
        @echo
 
 .PHONY: check-umids