mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 09:50:29 +01:00
Code Issues Projects Releases Wiki Activity

Integrate ntor test into the automake test suite.

Browse Source
This commit is contained in:
cypherpunks 2015-03-05 10:43:12 +01:00 committed by Nick Mathewson
parent 21e2425307
commit c535494238
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

1
configure.ac
View File

@ -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

6
src/test/include.am
View File

@ -1,6 +1,10 @@
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

9
src/test/test_ntor.sh.in Normal file
View File

@ -0,0 +1,9 @@
#!/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}