Browse Source

make "make test-stem" run stem tests on tor

Closes ticket 14107.
Nick Mathewson 9 years ago
parent
commit
d74f0cff92
3 changed files with 18 additions and 0 deletions
  1. 9 0
      Makefile.am
  2. 6 0
      changes/ticket14107
  3. 3 0
      src/or/include.am

+ 9 - 0
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
 

+ 6 - 0
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.
+

+ 3 - 0
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 = \