summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2019-09-04 08:33:27 -0400
committerDavid Goulet <dgoulet@torproject.org>2019-09-04 08:33:27 -0400
commit51103450e4a997aa5a31cf9d60b3b22355525bd5 (patch)
tree3837be48bcb7fc451d86cd8fad1cc32da0402e45
parentd6f3e225194cce776d2c3dc51be61cbc7ade65fb (diff)
parent630bb113a0825b4d4ef8a9447b4ff2557a571a1e (diff)
downloadtor-51103450e4a997aa5a31cf9d60b3b22355525bd5.tar.gz
tor-51103450e4a997aa5a31cf9d60b3b22355525bd5.zip
Merge branch 'maint-0.4.1' into release-0.4.1
-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 10bd4b45c2..3cac5f5331 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -295,7 +295,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.