Commit c5354942 authored by cypherpunks's avatar cypherpunks Committed by Nick Mathewson
Browse files

Integrate ntor test into the automake test suite.

parent 21e24253
......@@ -175,6 +175,7 @@ cscope.*
/src/test/test-ntor-cl.exe
/src/test/test_workqueue.exe
/src/test/test_zero_length_keys.sh
/src/test/test_ntor.sh
# /src/tools/
/src/tools/tor-checkkey
......
......@@ -1663,6 +1663,7 @@ AC_CONFIG_FILES([
scripts/maint/checkOptionDocs.pl
scripts/maint/updateVersions.pl
src/test/test_zero_length_keys.sh
src/test/test_ntor.sh
])
if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then
......
TESTS += src/test/test src/test/test-slow src/test/test-memwipe \
src/test/test_zero_length_keys.sh
if USEPYTHON
TESTS += src/test/test_ntor.sh
endif
TEST_EXTENSIONS = .sh
SH_LOG_COMPILER = $(SHELL)
......@@ -169,8 +173,6 @@ src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR)
if USEPYTHON
$(PYTHON) $(top_srcdir)/src/test/ntor_ref.py test-tor
$(PYTHON) $(top_srcdir)/src/test/ntor_ref.py self-test
$(top_builddir)/src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
$(top_builddir)/src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
endif
......
#!/bin/sh
# Validate Tor's ntor implementation.
exitcode=0
@PYTHON@ @abs_top_srcdir@/src/test/ntor_ref.py test-tor || exitcode=1
@PYTHON@ @abs_top_srcdir@/src/test/ntor_ref.py self-test || exitcode=1
exit ${exitcode}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment