summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Moss <david.moss@gmail.com>2015-09-03 20:59:28 +0100
committerDavid Moss <david.moss@gmail.com>2015-09-03 20:59:28 +0100
commite330d863efdf0e039f74d4b87113dc6df8dc9372 (patch)
tree5f5206c17acaba2a801792624a6d44a703319703
parentb6cff5240cfe3001a930c5afca72e594b79bb4a8 (diff)
downloadnetaddr-e330d863efdf0e039f74d4b87113dc6df8dc9372.tar.gz
- added config settings for CircleCI
-rw-r--r--Makefile4
-rw-r--r--circle.yml12
2 files changed, 16 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 415304f..9f5d92e 100644
--- a/Makefile
+++ b/Makefile
@@ -66,3 +66,7 @@ test: clean
python setup.py test
@echo 'running doc tests (tutorials)'
python tutorials/run_doctests.py
+
+test_with_junitxml: clean
+ @echo 'running test suite with JUnit XML output'
+ py.test -vv --junitxml=$$CI_REPORTS/junit.xml $(PWD)/netaddr/tests
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..a07dd73
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,12 @@
+machine:
+ python:
+ version: 2.7.10
+
+test:
+ override:
+ - make test_with_junitxml
+
+general:
+ branches:
+ only:
+ - rel-0.7.x