diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-05 11:52:36 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-06 09:03:44 -0500 |
| commit | d74f0cff92322174e19c5cbd98462bd25e14fc3c (patch) | |
| tree | ef7d504009671a841dc000c5f607fbcfb1751587 | |
| parent | 276700131a14697aa84d95a867782bbfd612277f (diff) | |
| download | tor-d74f0cff92322174e19c5cbd98462bd25e14fc3c.tar.gz tor-d74f0cff92322174e19c5cbd98462bd25e14fc3c.zip | |
make "make test-stem" run stem tests on tor
Closes ticket 14107.
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | changes/ticket14107 | 6 | ||||
| -rw-r--r-- | src/or/include.am | 3 |
3 files changed, 18 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 3de7f7a827..f6a1bcf520 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,15 @@ test: all test-network: all ./src/test/test-network.sh +test-stem: $(TESTING_TOR_BINARY) + @if test -d "$$STEM_SOURCE_DIR"; then \ + "$$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 "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \ + fi + + reset-gcov: rm -f src/*/*.gcda diff --git a/changes/ticket14107 b/changes/ticket14107 new file mode 100644 index 0000000000..e4ba6becb3 --- /dev/null +++ b/changes/ticket14107 @@ -0,0 +1,6 @@ + o Testing: + + - New "make test-stem" target to run stem integration tests. + Requires that the "STEM_SOURCE_DIR" environment variable be set. + Closes ticket 14107. + diff --git a/src/or/include.am b/src/or/include.am index fb1581c463..b44e1099dc 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -123,6 +123,9 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-event-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ +TESTING_TOR_BINARY = ./src/or/tor-cov +else +TESTING_TOR_BINARY = ./src/or/tor endif ORHEADERS = \ |