commit 9c6283732a376b21d110f1ef95b4b2af423a8e59 parent 1c47459e5a5ed6d404a8034502543e7e4a67be38 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 20 Dec 2018 07:50:04 -0500 Merge branch 'maint-0.3.5' Diffstat:
| M | Makefile.am | | | 2 | +- |
| A | changes/bug28568 | | | 4 | ++++ |
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am @@ -277,7 +277,7 @@ need-stem-path: fi test-stem: need-stem-path $(TESTING_TOR_BINARY) - @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL; + @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --log notice --target RUN_ALL; test-stem-full: need-stem-path $(TESTING_TOR_BINARY) @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v; diff --git a/changes/bug28568 b/changes/bug28568 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Stop running stem's unit tests as part of "make test-stem". But continue + to run stem's unit and online tests during "make test-stem-full". + Fixes bug 28568; bugfix on 0.2.6.3-alpha.