[Python-modules-commits] [python-psutil] 04/08: dont depend on install when running tests

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository python-psutil.

commit 0b963d7f27305028e9578ddb63fac7dbe4638152
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Apr 10 13:13:43 2016 +0100

    dont depend on install when running tests
---
 Makefile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b8c118f..e298e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,7 @@ install: build
 uninstall:
 	cd ..; $(PYTHON) -m pip uninstall -y -v psutil
 
+<<<<<<< 59d1042fdd4f68524fc5f231281e35602d85d86e
 # Install PIP (only if necessary).
 install-pip:
 	$(PYTHON) -c \
@@ -124,20 +125,31 @@ test-misc: install
 
 # Test memory leaks.
 test-memleaks: install
+=======
+test:
+	$(PYTHON) $(TSCRIPT)
+
+test-process:
+	$(PYTHON) -m unittest -v psutil.tests.test_process
+
+test-system:
+	$(PYTHON) -m unittest -v psutil.tests.test_system
+
+test-memleaks:
 	$(PYTHON) psutil/tests/test_memory_leaks.py
 
 # Run specific platform tests only.
-test-platform: install
+test-platform:
 	$(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS") if getattr(psutil, x)][0])'`.py
 
 # Run a specific test by name; e.g. "make test-by-name disk_" will run
 # all test methods containing "disk_" in their name.
 # Requires "pip install nose".
-test-by-name: install
+test-by-name:
 	@$(PYTHON) -m nose psutil/tests/*.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
 
 # Same as above but for test_memory_leaks.py script.
-test-memleaks-by-name: install
+test-memleaks-by-name:
 	@$(PYTHON) -m nose test/test_memory_leaks.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
 
 coverage: install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-psutil.git