aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-09-05 14:47:54 +1000
committerteor <teor@torproject.org>2019-09-05 14:47:54 +1000
commit896a1ac50b6ab182c1e15cc5271d0b24fcb90a31 (patch)
tree15826ad825a2fd3b96406a22ddb115709c8bd9b2
parent1203e137be4303bce42e46bd41eb78bf79f691d7 (diff)
parent04618371497bd5040d3af3e6fd782c361a7ba3a5 (diff)
downloadtor-896a1ac50b6ab182c1e15cc5271d0b24fcb90a31.tar.gz
tor-896a1ac50b6ab182c1e15cc5271d0b24fcb90a31.zip
Merge branch 'maint-0.3.5' into maint-0.4.0
-rw-r--r--Makefile.am2
-rw-r--r--changes/ticket315544
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 8bf2aaf910..4e5681fb41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -286,7 +286,7 @@ need-stem-path:
fi
test-stem: need-stem-path $(TESTING_TOR_BINARY)
- @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --log notice --target RUN_ALL;
+ @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --test control.controller --test control.base_controller --test process --log notice;
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/ticket31554 b/changes/ticket31554
new file mode 100644
index 0000000000..73f4159ff3
--- /dev/null
+++ b/changes/ticket31554
@@ -0,0 +1,4 @@
+ o Minor features (stem tests):
+ - Change "make test-stem" so it only runs the stem tests that use tor.
+ This change makes test-stem faster and more reliable.
+ Closes ticket 31554.