March 2015 - tor-commits - lists.torproject.org

[torbutton/master] Merge remote-tracking branch 'gk/bug_9387_v12'
by mikeperry＠torproject.org 24 Mar '15

24 Mar '15

commit 2acdf4d9ac039aee11351631a79ab0437dc4e39a Merge: 5ac0bb1 398eba8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 14:16:00 2015 -0700 Merge remote-tracking branch 'gk/bug_9387_v12' src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '15

24 Mar '15

commit 14cf343aa875c8a6dbf21414016b012969b7a208 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 24 21:15:53 2015 +0000 Update translations for torbutton-torbuttonproperties --- it/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torbutton.properties b/it/torbutton.properties index 938040c..d6e4e5e 100644 --- a/it/torbutton.properties +++ b/it/torbutton.properties @@ -56,7 +56,7 @@ torbutton.popup.never_ask_again = Non chiedermelo più torbutton.popup.confirm_newnym = Tor Browser chiuderà tutte le schede e finestre. Tutte le sezioni dei siti andranno perse.\n\nRiavviare ora Tor Browser per azzerare la tua identità?\n\n torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification_button = Apri impostazioni sicurezza # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Questo sito (%S) tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito?

1 0

[tor/master] Test: add missing libor.a in include.am
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 2dc5d790d314beb202dfa1659161113f1f6dabf1 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Mar 24 16:04:28 2015 -0400 Test: add missing libor.a in include.am Also add test-memwipe to .gitignore file. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 1 + src/test/include.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b31a713..d1bdc68 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 46fb99f..c0a1b37 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@ \

1 0

[tor/master] Here is a test for memwipe.
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit e82e600d6edb04247d1fd15f1d4b340ef544736e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 15:28:22 2015 -0400 Here is a test for memwipe. It invokes undefined behavior, I'm afraid, since there's no other c-legal way to test whether memwipe() works when we're not allowed to look at it. Closes ticket 15377. --- changes/test-memwipe | 3 + src/test/include.am | 11 ++- src/test/test-memwipe.c | 204 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+), 1 deletion(-) diff --git a/changes/test-memwipe b/changes/test-memwipe new file mode 100644 index 0000000..04a21f7 --- /dev/null +++ b/changes/test-memwipe @@ -0,0 +1,3 @@ + o Testing: + - Add a test to verify that the compiler does not eliminate our + memwipe() implementation. Closes ticket 15377. diff --git a/src/test/include.am b/src/test/include.am index c56e887..46fb99f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,10 +1,11 @@ -TESTS += src/test/test src/test/test-slow +TESTS += src/test/test src/test/test-slow src/test/test-memwipe noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED noinst_PROGRAMS+= \ src/test/test \ src/test/test-slow \ + src/test/test-memwipe \ src/test/test-child \ src/test/test_workqueue endif @@ -73,6 +74,9 @@ src_test_test_slow_SOURCES = \ src/test/testing_common.c \ src/ext/tinytest.c +src_test_test_memwipe_SOURCES = \ + src/test/test-memwipe.c + src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) @@ -100,6 +104,11 @@ src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS) src_test_test_slow_LDADD = $(src_test_test_LDADD) src_test_test_slow_LDFLAGS = $(src_test_test_LDFLAGS) +src_test_test_memwipe_CPPFLAGS = $(src_test_test_CPPFLAGS) +src_test_test_memwipe_CFLAGS = $(src_test_test_CFLAGS) +src_test_test_memwipe_LDADD = $(src_test_test_LDADD) +src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) + src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \ diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c new file mode 100644 index 0000000..a721a8e --- /dev/null +++ b/src/test/test-memwipe.c @@ -0,0 +1,204 @@ +#include <string.h> +#include <stdio.h> +#include <sys/types.h> +#include <stdlib.h> + +#include "crypto.h" +#include "compat.h" + +#undef MIN +#define MIN(a,b) ( ((a)<(b)) ? (a) : (b) ) + +static unsigned fill_a_buffer_memset(void) __attribute__((noinline)); +static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline)); +static unsigned fill_a_buffer_nothing(void) __attribute__((noinline)); +static unsigned fill_heap_buffer_memset(void) __attribute__((noinline)); +static unsigned fill_heap_buffer_memwipe(void) __attribute__((noinline)); +static unsigned fill_heap_buffer_nothing(void) __attribute__((noinline)); +static unsigned check_a_buffer(void) __attribute__((noinline)); + +const char *s = NULL; + +#define FILL_BUFFER_IMPL() \ + unsigned int i; \ + unsigned sum = 0; \ + \ + /* Fill up a 1k buffer with a recognizable pattern. */ \ + for (i = 0; i < 2048; i += strlen(s)) { \ + memcpy(buf+i, s, MIN(strlen(s), 2048-i)); \ + } \ + \ + /* Use the buffer as input to a computation so the above can't get */ \ + /* optimized away. */ \ + for (i = 0; i < 2048; ++i) { \ + sum += (unsigned char)buf[i]; \ + } + +static unsigned +fill_a_buffer_memset(void) +{ + char buf[2048]; + FILL_BUFFER_IMPL() + memset(buf, 0, sizeof(buf)); + return sum; +} + +static unsigned +fill_a_buffer_memwipe(void) +{ + char buf[2048]; + FILL_BUFFER_IMPL() + memwipe(buf, 0, sizeof(buf)); + return sum; +} + +static unsigned +fill_a_buffer_nothing(void) +{ + char buf[2048]; + FILL_BUFFER_IMPL() + return sum; +} + +static INLINE int +vmemeq(volatile char *a, const char *b, size_t n) +{ + while (n--) { + if (*a++ != *b++) + return 0; + } + return 1; +} + +static unsigned +check_a_buffer(void) +{ + unsigned int i; + volatile char buf[1024]; + unsigned sum = 0; + + /* See if this buffer has the string in it. + + YES, THIS DOES INVOKE UNDEFINED BEHAVIOR BY READING FROM AN UNINITIALIZED + BUFFER. + + If you know a better way to figure out whether the compiler eliminated + the memset/memwipe calls or not, please let me know. + */ + for (i = 0; i < sizeof(buf); ++i) { + if (vmemeq(buf+i, s, strlen(s))) + ++sum; + } + + return sum; +} + +static char *heap_buf = NULL; + +static unsigned +fill_heap_buffer_memset(void) +{ + char *buf = heap_buf = malloc(2048); + FILL_BUFFER_IMPL() + memset(buf, 0, 2048); + free(buf); + return sum; +} + +static unsigned +fill_heap_buffer_memwipe(void) +{ + char *buf = heap_buf = malloc(2048); + FILL_BUFFER_IMPL() + memwipe(buf, 0, 2048); + free(buf); + return sum; +} + +static unsigned +fill_heap_buffer_nothing(void) +{ + char *buf = heap_buf = malloc(2048); + FILL_BUFFER_IMPL() + free(buf); + return sum; +} + +static unsigned +check_heap_buffer(void) +{ + unsigned int i; + unsigned sum = 0; + volatile char *buf = heap_buf; + + /* See if this buffer has the string in it. + + YES, THIS DOES INVOKE UNDEFINED BEHAVIOR BY READING FROM A FREED BUFFER. + + If you know a better way to figure out whether the compiler eliminated + the memset/memwipe calls or not, please let me know. + */ + for (i = 0; i < sizeof(buf); ++i) { + if (vmemeq(buf+i, s, strlen(s))) + ++sum; + } + + return sum; +} + +static struct testcase { + const char *name; + unsigned (*fill_fn)(void); + unsigned (*check_fn)(void); +} testcases[] = { + { "nil", fill_a_buffer_nothing, check_a_buffer }, + { "nil-heap", fill_heap_buffer_nothing, check_heap_buffer }, + { "memset", fill_a_buffer_memset, check_a_buffer }, + { "memset-heap", fill_heap_buffer_memset, check_heap_buffer }, + { "memwipe", fill_a_buffer_memwipe, check_a_buffer }, + { "memwipe-heap", fill_heap_buffer_memwipe, check_heap_buffer }, + { NULL, NULL, NULL } +}; + +int +main(int argc, char **argv) +{ + unsigned x, x2; + int i; + int working = 1; + unsigned found[6]; + (void) argc; (void) argv; + + s = "squamous haberdasher gallimaufry"; + + memset(found, 0, sizeof(found)); + + for (i = 0; testcases[i].name; ++i) { + x = testcases[i].fill_fn(); + found[i] = testcases[i].check_fn(); + + x2 = fill_a_buffer_nothing(); + + if (x != x2) { + working = 0; + } + } + + if (!working || !found[0] || !found[1]) { + printf("It appears that this test case may not give you reliable " + "information. Sorry.\n"); + } + + if (!found[2] && !found[3]) { + printf("It appears that memset is good enough on this platform. Good.\n"); + } + + if (found[4] || found[5]) { + printf("ERROR: memwipe does not wipe data!\n"); + return 1; + } else { + printf("OKAY: memwipe seems to work."); + return 0; + } +} +

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug15377_027_01'
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit dde4ffeb973563eaac80a3ae314688139202b453 Merge: 9e80fc8 2dc5d79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 24 16:27:27 2015 -0400 Merge remote-tracking branch 'dgoulet/bug15377_027_01' .gitignore | 1 + changes/test-memwipe | 3 + src/test/include.am | 13 ++- src/test/test-memwipe.c | 204 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 219 insertions(+), 2 deletions(-)

1 0

[tor/master] Initialize two variables
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 348f2744cf0d026b1bd06a11d599f0ecf675038d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Mar 21 01:59:05 2015 +0100 Initialize two variables This is a trivial change to get around two compiler warnings when assertions are removed during coverage builds. --- src/common/aes.c | 2 +- src/or/connection.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index 7651f1d..95026dd 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -331,7 +331,7 @@ static void aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) { if (should_use_EVP) { - const EVP_CIPHER *c; + const EVP_CIPHER *c = 0; switch (key_bits) { case 128: c = EVP_aes_128_ecb(); break; case 192: c = EVP_aes_192_ecb(); break; diff --git a/src/or/connection.c b/src/or/connection.c index dcf716f..369df67 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1407,7 +1407,7 @@ static int connection_handle_listener_read(connection_t *conn, int new_type) { tor_socket_t news; /* the new socket */ - connection_t *newconn; + connection_t *newconn = 0; /* information about the remote peer when connecting to other routers */ struct sockaddr_storage addrbuf; struct sockaddr *remote = (struct sockaddr*)&addrbuf;

1 0

[tor/master] Disable assertions during coverage builds
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 1228dd293b60a8eaab03472fa29428c5e2752c44 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 20 13:12:09 2015 +0100 Disable assertions during coverage builds This removes roughly 5000 branches in my testing. We never want to trigger assertions even during tests, so this is sane. Implements #15400. --- Makefile.am | 20 ++++++++++++++++++++ changes/coverage | 6 ++++++ src/common/include.am | 6 +++--- src/common/util.h | 8 ++++++++ src/or/include.am | 4 ++-- src/test/include.am | 4 ++-- src/trunnel/include.am | 2 +- 7 files changed, 42 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c2d2c1..df893ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,8 +35,10 @@ EXTRA_DIST+= \ if COVERAGE_ENABLED TEST_CFLAGS=-fno-inline -fprofile-arcs -ftest-coverage +TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE else TEST_CFLAGS= +TEST_CPPFLAGS=-DTOR_UNIT_TESTS endif #install-data-local: @@ -80,6 +82,13 @@ test-stem: $(TESTING_TOR_BINARY) echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \ fi +test-stem-full: $(TESTING_TOR_BINARY) + @if test -d "$$STEM_SOURCE_DIR"; then \ + "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL,ONLINE -v; \ + else \ + echo '$$STEM_SOURCE_DIR was not set.'; echo; \ + echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \ + fi reset-gcov: rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda @@ -99,6 +108,17 @@ else @printf "Not configured with --enable-coverage, run ./configure --enable-coverage\n" endif +coverage-html-full: all + test -e "`which lcov`" || (echo "lcov must be installed. See <http://ltp.sourceforge.net/coverage/lcov.php>." && false) + test -d "$(HTML_COVER_DIR)" || mkdir -p "$(HTML_COVER_DIR)" + lcov --rc lcov_branch_coverage=1 --directory ./src --zerocounters + $(MAKE) reset-gcov + $(MAKE) check + $(MAKE) test-stem-full + lcov --capture --rc lcov_branch_coverage=1 --no-external --directory . --output-file "$(HTML_COVER_DIR)/lcov.tmp" + lcov --remove "$(HTML_COVER_DIR)/lcov.tmp" --rc lcov_branch_coverage=1 'test/*' 'ext/tinytest*' '/usr/*' --output-file "$(HTML_COVER_DIR)/lcov.info" + genhtml --branch-coverage -o "$(HTML_COVER_DIR)" "$(HTML_COVER_DIR)/lcov.info" + # Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c, # eventdns.[hc], tinytest*.[ch] check-spaces: diff --git a/changes/coverage b/changes/coverage new file mode 100644 index 0000000..bb7c7cf --- /dev/null +++ b/changes/coverage @@ -0,0 +1,6 @@ + o Minor features: + - Remove assertions during builds to determine Tor's test coverage. + We don't want to trigger these even in assertions, so including + them artificially makes our branch coverage look worse than it is. + This patch provides the new test-stem-full and coverage-html-full + configure options. Implements ticket 15400. diff --git a/src/common/include.am b/src/common/include.am index ec48935..00e0055 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -96,9 +96,9 @@ src_common_libor_testing_a_SOURCES = $(LIBOR_A_SOURCES) src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES) src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SOURCES) -src_common_libor_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) -src_common_libor_crypto_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) -src_common_libor_event_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_common_libor_event_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_common_libor_crypto_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) diff --git a/src/common/util.h b/src/common/util.h index 783c2a1..3584a87 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -45,6 +45,13 @@ #error "Sorry; we don't support building with NDEBUG." #endif +/* Don't use assertions during coverage. It leads to tons of unreached + * branches which in reality are only assertions we didn't hit. */ +#ifdef TOR_COVERAGE +#define tor_assert(a) STMT_BEGIN \ + (void)(a); \ + STMT_END +#else /** Like assert(3), but send assertion failures to the log as well as to * stderr. */ #define tor_assert(expr) STMT_BEGIN \ @@ -52,6 +59,7 @@ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ abort(); \ } STMT_END +#endif void tor_assertion_failed_(const char *fname, unsigned int line, const char *func, const char *expr); diff --git a/src/or/include.am b/src/or/include.am index 9298093..c7f22ab 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -99,7 +99,7 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" -src_or_libtor_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_or_libtor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. @@ -116,7 +116,7 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \ if COVERAGE_ENABLED src_or_tor_cov_SOURCES = src/or/tor_main.c -src_or_tor_cov_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_or_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ diff --git a/src/test/include.am b/src/test/include.am index c56e887..089c622 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -76,7 +76,7 @@ src_test_test_slow_SOURCES = \ src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) +src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS) src_test_bench_SOURCES = \ src/test/bench.c @@ -151,7 +151,7 @@ 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) +src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS) check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) diff --git a/src/trunnel/include.am b/src/trunnel/include.am index c7ac167..54e3db2 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -23,7 +23,7 @@ src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES) src_trunnel_libor_trunnel_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) src_trunnel_libor_trunnel_testing_a_SOURCES = $(TRUNNELSOURCES) -src_trunnel_libor_trunnel_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) +src_trunnel_libor_trunnel_testing_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_trunnel_libor_trunnel_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS+= $(TRUNNELHEADERS)

1 0

[tor/master] build tor-cov-{resolve,gencert}
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit e069a82aa723e6ee5a79f658c563781fb3e6e648 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 22 04:21:08 2015 +0100 build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds. --- .gitignore | 4 ++++ src/tools/include.am | 28 ++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b31a713..0751c75 100644 --- a/.gitignore +++ b/.gitignore @@ -179,10 +179,14 @@ cscope.* # /src/tools/ /src/tools/tor-checkkey /src/tools/tor-resolve +/src/tools/tor-cov-resolve /src/tools/tor-gencert +/src/tools/tor-cov-gencert /src/tools/tor-checkkey.exe /src/tools/tor-resolve.exe +/src/tools/tor-cov-resolve.exe /src/tools/tor-gencert.exe +/src/tools/tor-cov-gencert.exe /src/tools/Makefile /src/tools/Makefile.in diff --git a/src/tools/include.am b/src/tools/include.am index 54b150a..5d778c1 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -1,21 +1,45 @@ bin_PROGRAMS+= src/tools/tor-resolve src/tools/tor-gencert noinst_PROGRAMS+= src/tools/tor-checkkey +if COVERAGE_ENABLED +noinst_PROGRAMS+= src/tools/tor-cov-resolve src/tools/tor-cov-gencert +endif + src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c src_tools_tor_resolve_LDFLAGS = src_tools_tor_resolve_LDADD = src/common/libor.a @TOR_LIB_MATH@ @TOR_LIB_WS32@ +if COVERAGE_ENABLED +src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c +src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) +src_tools_tor_cov_resolve_LDADD = src/common/libor-testing.a \ + @TOR_LIB_MATH@ @TOR_LIB_WS32@ +endif + src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \ - $(LIBDONNA) \ + $(LIBDONNA) \ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ + +if COVERAGE_ENABLED +src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c +src_tools_tor_cov_gencert_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_tools_tor_cov_gencert_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) +src_tools_tor_cov_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ +src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \ + src/common/libor-crypto-testing.a \ + $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ +endif src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c src_tools_tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_checkkey_LDADD = src/common/libor.a src/common/libor-crypto.a \ - $(LIBDONNA) \ + $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@

1 0

[tor/master] Add call to chutney to coverage-html-full target
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 1be62cf48dafb78baebed5a64d4aceabeddde398 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 22 04:22:04 2015 +0100 Add call to chutney to coverage-html-full target Now make coverage-html-full should be a pretty good approximation of our actual coverage --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index df893ff..316086c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,8 @@ coverage-html-full: all $(MAKE) reset-gcov $(MAKE) check $(MAKE) test-stem-full + CHUTNEY_TOR=tor-cov CHUTNEY_TOR_GENCERT=tor-cov-gencert $(top_srcdir)/src/test/test-network.sh + CHUTNEY_TOR=tor-cov CHUTNEY_TOR_GENCERT=tor-cov-gencert $(top_srcdir)/src/test/test-network.sh --flavor hs lcov --capture --rc lcov_branch_coverage=1 --no-external --directory . --output-file "$(HTML_COVER_DIR)/lcov.tmp" lcov --remove "$(HTML_COVER_DIR)/lcov.tmp" --rc lcov_branch_coverage=1 'test/*' 'ext/tinytest*' '/usr/*' --output-file "$(HTML_COVER_DIR)/lcov.info" genhtml --branch-coverage -o "$(HTML_COVER_DIR)" "$(HTML_COVER_DIR)/lcov.info"

1 0

[tor/master] Fix test-network.sh argument parsing
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 1a50cb88e684638b8b1fd066ac1ffbc7e8898a5e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 22 09:41:05 2015 +0100 Fix test-network.sh argument parsing The bash on one of my machines didn't understand the question mark correctly, it didn't end up accepting flavor. We can spell it out explicitly. --- src/test/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index be57caf..ccfb5df 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -13,7 +13,7 @@ do export TOR_DIR="$2" shift ;; - --flavo?r|--network-flavo?r) + --flavor|--flavour|--network-flavor|--network-flavour) export NETWORK_FLAVOUR="$2" shift ;;

1 0