nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved targets for "run all the tests, no, all of them."

Browse Source
This commit is contained in:
Nick Mathewson 2015-08-03 13:03:58 -04:00
parent 347fe449fe
commit 6de49f4d9a
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.am
View File

@ -69,26 +69,34 @@ doxygen:
test: all test: all
$(top_builddir)/src/test/test $(top_builddir)/src/test/test
need-chutney-path:
@if test ! -d "$$CHUTNEY_PATH"; then \
echo '$$CHUTNEY_PATH was not set.'; echo; \
echo "To run these tests, git clone https://git.torproject.org/chutney.git ; export CHUTNEY_PATH=\`pwd\`/chutney"; \
exit 1; \
fi
# Note that test-network requires a copy of Chutney in $CHUTNEY_PATH. # Note that test-network requires a copy of Chutney in $CHUTNEY_PATH.
# Chutney can be cloned from https://git.torproject.org/chutney.git . # Chutney can be cloned from https://git.torproject.org/chutney.git .
test-network: all test-network: need-chutney-path all
$(top_srcdir)/src/test/test-network.sh $(top_srcdir)/src/test/test-network.sh
test-stem: $(TESTING_TOR_BINARY) need-stem-path:
@if test -d "$$STEM_SOURCE_DIR"; then \ @if test ! -d "$$STEM_SOURCE_DIR"; then \
$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; \
else \
echo '$$STEM_SOURCE_DIR was not set.'; echo; \ echo '$$STEM_SOURCE_DIR was not set.'; echo; \
echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \ echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \
exit 1; \
fi fi
test-stem-full: $(TESTING_TOR_BINARY) test-stem: need-stem-path $(TESTING_TOR_BINARY)
@if test -d "$$STEM_SOURCE_DIR"; then \ @$(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) --all --log notice --target RUN_ALL,ONLINE -v; \
else \ test-stem-full: need-stem-path $(TESTING_TOR_BINARY)
echo '$$STEM_SOURCE_DIR was not set.'; echo; \ @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL,ONLINE -v;
echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \
fi test-full: need-stem-path need-chutney-path check test-network test-stem
test-full-online: need-stem-path need-chutney-path check test-network test-stem-full
reset-gcov: reset-gcov:
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda

3
changes/early-check-paths Normal file
View File

@ -0,0 +1,3 @@
o Testing:
- When running test-network or test-stem, check for the absence
of stem/chutney before doing any build operations.

3
changes/test-full Normal file
View File

@ -0,0 +1,3 @@
o Testing:
- Add new 'test-full' and 'test-full-online' targets to run all tests,
including integration tests with stem and chutney.