diff options
| author | David Goulet <dgoulet@ev0ke.net> | 2015-03-24 16:04:28 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@ev0ke.net> | 2015-03-24 16:04:30 -0400 |
| commit | 2dc5d790d314beb202dfa1659161113f1f6dabf1 (patch) | |
| tree | 04b5def930a23b0e6e58d970437aa8e9fbbb2ebf | |
| parent | e82e600d6edb04247d1fd15f1d4b340ef544736e (diff) | |
| download | tor-2dc5d790d314beb202dfa1659161113f1f6dabf1.tar.gz tor-2dc5d790d314beb202dfa1659161113f1f6dabf1.zip | |
Test: add missing libor.a in include.am
Also add test-memwipe to .gitignore file.
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/test/include.am | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b31a7132d4..d1bdc68dec 100644 --- a/.gitignore +++ b/.gitignore @@ -167,6 +167,7 @@ cscope.* /src/test/test-slow /src/test/test-bt-cl /src/test/test-child +/src/test/test-memwipe /src/test/test-ntor-cl /src/test/test_workqueue /src/test/test.exe diff --git a/src/test/include.am b/src/test/include.am index 46fb99fc33..c0a1b374fe 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -93,7 +93,7 @@ src_test_test_workqueue_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ - src/common/libor-crypto-testing.a $(LIBDONNA) \ + src/common/libor-crypto-testing.a $(LIBDONNA) src/common/libor.a \ src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ |