diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-11 13:21:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-11 13:21:42 -0400 |
| commit | f308adf8382bc7e61ea05a172057260cf8be9a6b (patch) | |
| tree | 7355c13e09fc0ee1a5b6d8b5e56f5343588eaa65 /src/test/include.am | |
| parent | 187398318ef9b8b66e0f19ef031a847e8824e1d1 (diff) | |
| download | tor-f308adf8382bc7e61ea05a172057260cf8be9a6b.tar.gz tor-f308adf8382bc7e61ea05a172057260cf8be9a6b.zip | |
When possible, run the ntor python integration tests too
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/test/include.am b/src/test/include.am index ed0ef04247..c452d2659e 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -74,11 +74,22 @@ src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ -I"$(top_srcdir)/src/or" +NTOR_TEST_DEPS=src/test/test-ntor-cl +else +NTOR_TEST_DEPS= +endif +if COVERAGE_ENABLED +CMDLINE_TEST_TOR = ./src/or/tor-cov +else +CMDLINE_TEST_TOR = ./src/or/tor endif -check-local: +check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) if USEPYTHON - $(PYTHON) src/test/test_cmdline_args.py + $(PYTHON) src/test/test_cmdline_args.py $(CMDLINE_TEST_TOR) "${top_srcdir}" +if CURVE25519_ENABLED + $(PYTHON) src/test/ntor_ref.py test-tor + $(PYTHON) src/test/ntor_ref.py self-test +endif endif - |