diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-18 11:00:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-18 11:00:16 -0500 |
| commit | fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4 (patch) | |
| tree | 0d0f0b0aa37423e8f36f11e8410849e48be59ba6 /src/test/include.am | |
| parent | 7a2b30fe16eacc040b3dd11f8c39c410628c2f43 (diff) | |
| parent | c81f64ab44f71a97649a44e10d6fcbf15aa8c835 (diff) | |
| download | tor-fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4.tar tor-fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4.tar.gz | |
Merge branch 'backtrace_squashed'
Conflicts:
src/common/sandbox.c
src/common/sandbox.h
src/common/util.c
src/or/main.c
src/test/include.am
src/test/test.c
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am index 5510293cd..c16dd14fe 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -30,6 +30,7 @@ src_test_test_SOURCES = \ src/test/test_dir.c \ src/test/test_extorport.c \ src/test/test_introduce.c \ + src/test/test_logging.c \ src/test/test_microdesc.c \ src/test/test_options.c \ src/test/test_pt.c \ @@ -86,6 +87,15 @@ else CMDLINE_TEST_TOR = ./src/or/tor endif +noinst_PROGRAMS += src/test/test-bt-cl +src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c +src_test_test_bt_cl_LDADD = src/common/libor-testing.a \ + @TOR_LIB_MATH@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ +src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) +src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) + + check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) if USEPYTHON $(PYTHON) $(top_srcdir)/src/test/test_cmdline_args.py $(CMDLINE_TEST_TOR) "${top_srcdir}" @@ -93,4 +103,6 @@ if CURVE25519_ENABLED $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py test-tor $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py self-test endif + ./src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py + ./src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py endif |