summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2015-01-22 00:29:35 -0800
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2015-01-22 00:29:35 -0800
commit64b68b274ce2795cf650002cf27e26e05eff5ea1 (patch)
tree907938319344d79039a8e590f6057b96a0149e99 /Makefile
parentdaa4c5bd7bf02c21e82b1522ca44b2b6049010b5 (diff)
parent3f6a85c23c8c3a016f6360baf9614b6720e5c1f4 (diff)
downloadcaffeonacl-64b68b274ce2795cf650002cf27e26e05eff5ea1.tar.gz
caffeonacl-64b68b274ce2795cf650002cf27e26e05eff5ea1.tar.bz2
caffeonacl-64b68b274ce2795cf650002cf27e26e05eff5ea1.zip
Merge pull request #1473 from longjon/pytest
Python testing
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 41805511..53c16ea4 100644
--- a/Makefile
+++ b/Makefile
@@ -441,6 +441,9 @@ runtest: $(TEST_ALL_BIN) $(TEST_ALL_DYNLINK_BIN)
$(TEST_ALL_BIN) $(TEST_GPUID) --gtest_shuffle $(TEST_FILTER) && \
$(TEST_ALL_DYNLINK_BIN) $(TEST_GPUID) --gtest_shuffle $(TEST_FILTER)
+pytest: py
+ cd python; python -m unittest discover -s caffe/test
+
warn: $(EMPTY_WARN_REPORT)
$(EMPTY_WARN_REPORT): $(ALL_WARNS) | $(BUILD_DIR)