[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] make "make test-stem" run stem tests on tor
commit d74f0cff92322174e19c5cbd98462bd25e14fc3c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon Jan 5 11:52:36 2015 -0500
make "make test-stem" run stem tests on tor
Closes ticket 14107.
---
Makefile.am | 9 +++++++++
changes/ticket14107 | 6 ++++++
src/or/include.am | 3 +++
3 files changed, 18 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 3de7f7a..f6a1bcf 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 0000000..e4ba6be
--- /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 fb1581c..b44e109 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 = \
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits