diff options
| author | Bruno Wagner <bwagner@riseup.net> | 2017-01-09 18:55:59 -0200 |
|---|---|---|
| committer | Bruno Wagner <bwagner@riseup.net> | 2017-01-09 18:55:59 -0200 |
| commit | 96e377d4957b32db440f8179d4c1b16de724fa71 (patch) | |
| tree | e33facf575bfaf838c68b84c6c71d966a89e6b8d /Makefile | |
| parent | fa3660a5a10935be343f0fcb8b09515375f79736 (diff) | |
Moved source to . so we are compatible with sh
Snap uses sh directly to run the build, so we cannot expect
bash. I changed everything to . so that the make runs more broadly
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -14,13 +14,13 @@ install: requirements install_py install_js .PHONY: requirements_py requirements_py: create_virtualenv @echo "Upgrading pip and setuptools" - @source $(VIRTUALENV)/bin/activate;\ + @. $(VIRTUALENV)/bin/activate;\ pip install --upgrade pip setuptools .PHONY: install_py install_py: service/requirements.txt service/test_requirements.txt @echo "Installing python packages" - @source $(VIRTUALENV)/bin/activate;\ + @. $(VIRTUALENV)/bin/activate;\ cd service;\ pip install pysqlcipher --upgrade --force-reinstall --install-option="--bundled";\ pip install --exists-action s -r requirements.txt -r test_requirements.txt @@ -64,7 +64,7 @@ linters: clean requirements install linters_py linters_js .PHONY: linters_py linters_py: @echo "Running pep8" - @source $(VIRTUALENV)/bin/activate;\ + @. $(VIRTUALENV)/bin/activate;\ cd service;\ pep8 --ignore=E501 pixelated test @@ -76,7 +76,7 @@ linters_js: .PHONY: coverage coverage: - @source $(VIRTUALENV)/bin/activate;\ + @. $(VIRTUALENV)/bin/activate;\ cd service;\ coverage run -p --source=pixelated `which trial` test.unit;\ coverage run -p --source=pixelated `which trial` test.integration;\ @@ -86,7 +86,7 @@ coverage: .PHONY: unit_tests_py unit_tests_py: @echo "Running python unit tests" - @source $(VIRTUALENV)/bin/activate;\ + @. $(VIRTUALENV)/bin/activate;\ cd service;\ trial --reporter=text test.unit @@ -99,14 +99,14 @@ unit_tests_js: .PHONY: integration_tests_py integration_tests: @echo "Running integration tests" - @source $(VIRTUALENV)/bin/activate;\ + @. $(VIRTUALENV)/bin/activate;\ cd service;\ trial -j`grep -c "^processor" /proc/cpuinfo || sysctl -n hw.logicalcpu` --reporter=text test.integration .PHONY: functional_tests functional_tests: clean requirements install ensure_phantomjs_installed @echo "Running behave functional tests" - @source $(VIRTUALENV)/bin/activate;\ + @. $(VIRTUALENV)/bin/activate;\ cd service;\ behave --tags ~@wip --tags ~@smoke test/functional/features |