diff options
| author | cypherpunks <cypherpunks@torproject.org> | 2015-03-05 09:03:06 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-23 09:56:12 -0400 |
| commit | 21e242530783f9f71bad3e94f6482ac100c710e8 (patch) | |
| tree | 2d730f7aa1940354a41689bc722e5160e2146655 /src/test/include.am | |
| parent | 372aef8981f383db8962fbbe67f4d18b56d3740d (diff) | |
| download | tor-21e242530783f9f71bad3e94f6482ac100c710e8.tar.gz tor-21e242530783f9f71bad3e94f6482ac100c710e8.zip | |
Integrate zero_length_keys test into the automake test suite.
The zero length keys test now requires the path to the Tor binary as the first
parameter to ensure the correct Tor binary is used without hard coding a path.
The wrapper script calls the zero length keys test for each test separately to
ensure the correct shell is used (as configured by autoconf). Another solution
would have been to place the tests into separate functions so multiple tests
could be run internally. This would have made a diff of considerable size and
frankly it is outside the scope of this fix.
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am index c857ec2f89..eba13abd24 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,4 +1,8 @@ -TESTS += src/test/test src/test/test-slow src/test/test-memwipe +TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ + src/test/test_zero_length_keys.sh + +TEST_EXTENSIONS = .sh +SH_LOG_COMPILER = $(SHELL) noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED @@ -170,7 +174,6 @@ if USEPYTHON $(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 - $(SHELL) $(top_srcdir)/src/test/zero_length_keys.sh EXTRA_DIST += \ src/test/bt_test.py \ |