- tor-commits - lists.torproject.org

[tor/master] Port over the last ht.h changes from libevent: avoid _reserved identifiers
by nickm＠torproject.org 14 Feb '12

14 Feb '12

commit a31fb42d2e5aed07748effc5ec765b7478a84bba Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 18:40:30 2012 -0500 Port over the last ht.h changes from libevent: avoid _reserved identifiers --- src/common/container.c | 8 ++-- src/common/ht.h | 72 ++++++++++++++++++++++++------------------------ 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index 81a946a..23ec9d3 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -1027,7 +1027,7 @@ digestmap_set(digestmap_t *map, const char *key, void *val) * the hash table that we do in the unoptimized code above. (Each of * HT_INSERT and HT_FIND calls HT_SET_HASH and HT_FIND_P.) */ - _HT_FIND_OR_INSERT(digestmap_impl, node, digestmap_entry_hash, &(map->head), + HT_FIND_OR_INSERT_(digestmap_impl, node, digestmap_entry_hash, &(map->head), digestmap_entry_t, &search, ptr, { /* we found an entry. */ @@ -1041,7 +1041,7 @@ digestmap_set(digestmap_t *map, const char *key, void *val) tor_malloc_zero(sizeof(digestmap_entry_t)); memcpy(newent->key, key, DIGEST_LEN); newent->val = val; - _HT_FOI_INSERT(node, &(map->head), &search, newent, ptr); + HT_FOI_INSERT_(node, &(map->head), &search, newent, ptr); return NULL; }); #endif @@ -1354,14 +1354,14 @@ digestmap_free(digestmap_t *map, void (*free_val)(void*)) void strmap_assert_ok(const strmap_t *map) { - tor_assert(!_strmap_impl_HT_REP_IS_BAD(&map->head)); + tor_assert(!strmap_impl_HT_REP_IS_BAD_(&map->head)); } /** Fail with an assertion error if anything has gone wrong with the internal * representation of <b>map</b>. */ void digestmap_assert_ok(const digestmap_t *map) { - tor_assert(!_digestmap_impl_HT_REP_IS_BAD(&map->head)); + tor_assert(!digestmap_impl_HT_REP_IS_BAD_(&map->head)); } /** Return true iff <b>map</b> has no entries. */ diff --git a/src/common/ht.h b/src/common/ht.h index 12977cb..f7d4ce1 100644 --- a/src/common/ht.h +++ b/src/common/ht.h @@ -102,24 +102,24 @@ ht_string_hash(const char *s) } #ifndef HT_NO_CACHE_HASH_VALUES -#define _HT_SET_HASH(elm, field, hashfn) \ +#define HT_SET_HASH_(elm, field, hashfn) \ do { (elm)->field.hte_hash = hashfn(elm); } while (0) -#define _HT_SET_HASHVAL(elm, field, val) \ +#define HT_SET_HASHVAL_(elm, field, val) \ do { (elm)->field.hte_hash = (val); } while (0) -#define _HT_ELT_HASH(elm, field, hashfn) \ +#define HT_ELT_HASH_(elm, field, hashfn) \ ((elm)->field.hte_hash) #else -#define _HT_SET_HASH(elm, field, hashfn) \ +#define HT_SET_HASH_(elm, field, hashfn) \ ((void)0) -#define _HT_ELT_HASH(elm, field, hashfn) \ +#define HT_ELT_HASH_(elm, field, hashfn) \ (hashfn(elm)) -#define _HT_SET_HASHVAL(elm, field, val) \ +#define HT_SET_HASHVAL_(elm, field, val) \ ((void)0) #endif /* Helper: alias for the bucket containing 'elm'. */ -#define _HT_BUCKET(head, field, elm, hashfn) \ - ((head)->hth_table[_HT_ELT_HASH(elm,field,hashfn) % head->hth_table_length]) +#define HT_BUCKET_(head, field, elm, hashfn) \ + ((head)->hth_table[HT_ELT_HASH_(elm,field,hashfn) % head->hth_table_length]) #define HT_FOREACH(x, name, head) \ for ((x) = HT_START(name, head); \ @@ -129,7 +129,7 @@ ht_string_hash(const char *s) #define HT_PROTOTYPE(name, type, field, hashfn, eqfn) \ int name##_HT_GROW(struct name *ht, unsigned min_capacity); \ void name##_HT_CLEAR(struct name *ht); \ - int _##name##_HT_REP_IS_BAD(const struct name *ht); \ + int name##_HT_REP_IS_BAD_(const struct name *ht); \ static INLINE void \ name##_HT_INIT(struct name *head) { \ head->hth_table_length = 0; \ @@ -141,12 +141,12 @@ ht_string_hash(const char *s) /* Helper: returns a pointer to the right location in the table \ * 'head' to find or insert the element 'elm'. */ \ static INLINE struct type ** \ - _##name##_HT_FIND_P(struct name *head, struct type *elm) \ + name##_HT_FIND_P_(struct name *head, struct type *elm) \ { \ struct type **p; \ if (!head->hth_table) \ return NULL; \ - p = &_HT_BUCKET(head, field, elm, hashfn); \ + p = &HT_BUCKET_(head, field, elm, hashfn); \ while (*p) { \ if (eqfn(*p, elm)) \ return p; \ @@ -161,8 +161,8 @@ ht_string_hash(const char *s) { \ struct type **p; \ struct name *h = (struct name *) head; \ - _HT_SET_HASH(elm, field, hashfn); \ - p = _##name##_HT_FIND_P(h, elm); \ + HT_SET_HASH_(elm, field, hashfn); \ + p = name##_HT_FIND_P_(h, elm); \ return p ? *p : NULL; \ } \ /* Insert the element 'elm' into the table 'head'. Do not call this \ @@ -174,8 +174,8 @@ ht_string_hash(const char *s) if (!head->hth_table || head->hth_n_entries >= head->hth_load_limit) \ name##_HT_GROW(head, head->hth_n_entries+1); \ ++head->hth_n_entries; \ - _HT_SET_HASH(elm, field, hashfn); \ - p = &_HT_BUCKET(head, field, elm, hashfn); \ + HT_SET_HASH_(elm, field, hashfn); \ + p = &HT_BUCKET_(head, field, elm, hashfn); \ elm->field.hte_next = *p; \ *p = elm; \ } \ @@ -188,8 +188,8 @@ ht_string_hash(const char *s) struct type **p, *r; \ if (!head->hth_table || head->hth_n_entries >= head->hth_load_limit) \ name##_HT_GROW(head, head->hth_n_entries+1); \ - _HT_SET_HASH(elm, field, hashfn); \ - p = _##name##_HT_FIND_P(head, elm); \ + HT_SET_HASH_(elm, field, hashfn); \ + p = name##_HT_FIND_P_(head, elm); \ r = *p; \ *p = elm; \ if (r && (r!=elm)) { \ @@ -207,8 +207,8 @@ ht_string_hash(const char *s) name##_HT_REMOVE(struct name *head, struct type *elm) \ { \ struct type **p, *r; \ - _HT_SET_HASH(elm, field, hashfn); \ - p = _##name##_HT_FIND_P(head,elm); \ + HT_SET_HASH_(elm, field, hashfn); \ + p = name##_HT_FIND_P_(head,elm); \ if (!p || !*p) \ return NULL; \ r = *p; \ @@ -269,7 +269,7 @@ ht_string_hash(const char *s) if ((*elm)->field.hte_next) { \ return &(*elm)->field.hte_next; \ } else { \ - unsigned b = (_HT_ELT_HASH(*elm, field, hashfn) % head->hth_table_length)+1; \ + unsigned b = (HT_ELT_HASH_(*elm, field, hashfn) % head->hth_table_length)+1; \ while (b < head->hth_table_length) { \ if (head->hth_table[b]) \ return &head->hth_table[b]; \ @@ -281,7 +281,7 @@ ht_string_hash(const char *s) static INLINE struct type ** \ name##_HT_NEXT_RMV(struct name *head, struct type **elm) \ { \ - unsigned h = _HT_ELT_HASH(*elm, field, hashfn); \ + unsigned h = HT_ELT_HASH_(*elm, field, hashfn); \ *elm = (*elm)->field.hte_next; \ --head->hth_n_entries; \ if (*elm) { \ @@ -338,7 +338,7 @@ ht_string_hash(const char *s) elm = head->hth_table[b]; \ while (elm) { \ next = elm->field.hte_next; \ - b2 = _HT_ELT_HASH(elm, field, hashfn) % new_len; \ + b2 = HT_ELT_HASH_(elm, field, hashfn) % new_len; \ elm->field.hte_next = new_table[b2]; \ new_table[b2] = elm; \ elm = next; \ @@ -356,7 +356,7 @@ ht_string_hash(const char *s) for (b=0; b < head->hth_table_length; ++b) { \ struct type *e, **pE; \ for (pE = &new_table[b], e = *pE; e != NULL; e = *pE) { \ - b2 = _HT_ELT_HASH(e, field, hashfn) % new_len; \ + b2 = HT_ELT_HASH_(e, field, hashfn) % new_len; \ if (b2 == b) { \ pE = &e->field.hte_next; \ } else { \ @@ -386,7 +386,7 @@ ht_string_hash(const char *s) /* Debugging helper: return false iff the representation of 'head' is \ * internally consistent. */ \ int \ - _##name##_HT_REP_IS_BAD(const struct name *head) \ + name##_HT_REP_IS_BAD_(const struct name *head) \ { \ unsigned n, i; \ struct type *elm; \ @@ -408,9 +408,9 @@ ht_string_hash(const char *s) return 5; \ for (n = i = 0; i < head->hth_table_length; ++i) { \ for (elm = head->hth_table[i]; elm; elm = elm->field.hte_next) { \ - if (_HT_ELT_HASH(elm, field, hashfn) != hashfn(elm)) \ + if (HT_ELT_HASH_(elm, field, hashfn) != hashfn(elm)) \ return 1000 + i; \ - if ((_HT_ELT_HASH(elm, field, hashfn) % head->hth_table_length) != i) \ + if ((HT_ELT_HASH_(elm, field, hashfn) % head->hth_table_length) != i) \ return 10000 + i; \ ++n; \ } \ @@ -423,24 +423,24 @@ ht_string_hash(const char *s) /** Implements an over-optimized "find and insert if absent" block; * not meant for direct usage by typical code, or usage outside the critical * path.*/ -#define _HT_FIND_OR_INSERT(name, field, hashfn, head, eltype, elm, var, y, n) \ +#define HT_FIND_OR_INSERT_(name, field, hashfn, head, eltype, elm, var, y, n) \ { \ - struct name *_##var##_head = head; \ - struct eltype **var; \ - if (!_##var##_head->hth_table || \ - _##var##_head->hth_n_entries >= _##var##_head->hth_load_limit) \ - name##_HT_GROW(_##var##_head, _##var##_head->hth_n_entries+1); \ - _HT_SET_HASH((elm), field, hashfn); \ - var = _##name##_HT_FIND_P(_##var##_head, (elm)); \ + struct name *var##_head_ = head; \ + struct eltype **var; \ + if (!var##_head_->hth_table || \ + var##_head_->hth_n_entries >= var##_head_->hth_load_limit) \ + name##_HT_GROW(var##_head_, var##_head_->hth_n_entries+1); \ + HT_SET_HASH_((elm), field, hashfn); \ + var = name##_HT_FIND_P_(var##_head_, (elm)); \ if (*var) { \ y; \ } else { \ n; \ } \ } -#define _HT_FOI_INSERT(field, head, elm, newent, var) \ +#define HT_FOI_INSERT_(field, head, elm, newent, var) \ { \ - _HT_SET_HASHVAL(newent, field, (elm)->field.hte_hash); \ + HT_SET_HASHVAL_(newent, field, (elm)->field.hte_hash); \ newent->field.hte_next = NULL; \ *var = newent; \ ++((head)->hth_n_entries); \

1 0

[tor/master] Port over ht.h improvements from Libevent.
by nickm＠torproject.org 14 Feb '12

14 Feb '12

commit 107f604f31f6b0a4719e4a459058f013a62b8af3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 18:06:40 2012 -0500 Port over ht.h improvements from Libevent. There is a facility (not used now in Tor) to avoid storing the hash of a given type if it is a fast-to-calculate hash. There are also a few ancient-openbsd compilation issues fixed here. The fact that Tor says INLINE while Libevent says inline remains unaddressed. --- src/common/ht.h | 54 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/common/ht.h b/src/common/ht.h index 3f374b4..12977cb 100644 --- a/src/common/ht.h +++ b/src/common/ht.h @@ -25,19 +25,22 @@ #define HT_INITIALIZER() \ { NULL, 0, 0, 0, -1 } +#ifdef HT_NO_CACHE_HASH_VALUES +#define HT_ENTRY(type) \ + struct { \ + struct type *hte_next; \ + } +#else #define HT_ENTRY(type) \ struct { \ struct type *hte_next; \ unsigned hte_hash; \ } +#endif #define HT_EMPTY(head) \ ((head)->hth_n_entries == 0) -/* Helper: alias for the bucket containing 'elm'. */ -#define _HT_BUCKET(head, field, elm) \ - ((head)->hth_table[elm->field.hte_hash % head->hth_table_length]) - /* How many elements in 'head'? */ #define HT_SIZE(head) \ ((head)->hth_n_entries) @@ -98,8 +101,25 @@ ht_string_hash(const char *s) return h; } +#ifndef HT_NO_CACHE_HASH_VALUES #define _HT_SET_HASH(elm, field, hashfn) \ - (elm)->field.hte_hash = hashfn(elm) + do { (elm)->field.hte_hash = hashfn(elm); } while (0) +#define _HT_SET_HASHVAL(elm, field, val) \ + do { (elm)->field.hte_hash = (val); } while (0) +#define _HT_ELT_HASH(elm, field, hashfn) \ + ((elm)->field.hte_hash) +#else +#define _HT_SET_HASH(elm, field, hashfn) \ + ((void)0) +#define _HT_ELT_HASH(elm, field, hashfn) \ + (hashfn(elm)) +#define _HT_SET_HASHVAL(elm, field, val) \ + ((void)0) +#endif + +/* Helper: alias for the bucket containing 'elm'. */ +#define _HT_BUCKET(head, field, elm, hashfn) \ + ((head)->hth_table[_HT_ELT_HASH(elm,field,hashfn) % head->hth_table_length]) #define HT_FOREACH(x, name, head) \ for ((x) = HT_START(name, head); \ @@ -126,7 +146,7 @@ ht_string_hash(const char *s) struct type **p; \ if (!head->hth_table) \ return NULL; \ - p = &_HT_BUCKET(head, field, elm); \ + p = &_HT_BUCKET(head, field, elm, hashfn); \ while (*p) { \ if (eqfn(*p, elm)) \ return p; \ @@ -155,7 +175,7 @@ ht_string_hash(const char *s) name##_HT_GROW(head, head->hth_n_entries+1); \ ++head->hth_n_entries; \ _HT_SET_HASH(elm, field, hashfn); \ - p = &_HT_BUCKET(head, field, elm); \ + p = &_HT_BUCKET(head, field, elm, hashfn); \ elm->field.hte_next = *p; \ *p = elm; \ } \ @@ -207,7 +227,6 @@ ht_string_hash(const char *s) void *data) \ { \ unsigned idx; \ - int remove; \ struct type **p, **nextp, *next; \ if (!head->hth_table) \ return; \ @@ -216,8 +235,7 @@ ht_string_hash(const char *s) while (*p) { \ nextp = &(*p)->field.hte_next; \ next = *nextp; \ - remove = fn(*p, data); \ - if (remove) { \ + if (fn(*p, data)) { \ --head->hth_n_entries; \ *p = next; \ } else { \ @@ -251,7 +269,7 @@ ht_string_hash(const char *s) if ((*elm)->field.hte_next) { \ return &(*elm)->field.hte_next; \ } else { \ - unsigned b = ((*elm)->field.hte_hash % head->hth_table_length)+1; \ + unsigned b = (_HT_ELT_HASH(*elm, field, hashfn) % head->hth_table_length)+1; \ while (b < head->hth_table_length) { \ if (head->hth_table[b]) \ return &head->hth_table[b]; \ @@ -263,7 +281,7 @@ ht_string_hash(const char *s) static INLINE struct type ** \ name##_HT_NEXT_RMV(struct name *head, struct type **elm) \ { \ - unsigned h = (*elm)->field.hte_hash; \ + unsigned h = _HT_ELT_HASH(*elm, field, hashfn); \ *elm = (*elm)->field.hte_next; \ --head->hth_n_entries; \ if (*elm) { \ @@ -320,7 +338,7 @@ ht_string_hash(const char *s) elm = head->hth_table[b]; \ while (elm) { \ next = elm->field.hte_next; \ - b2 = elm->field.hte_hash % new_len; \ + b2 = _HT_ELT_HASH(elm, field, hashfn) % new_len; \ elm->field.hte_next = new_table[b2]; \ new_table[b2] = elm; \ elm = next; \ @@ -338,7 +356,7 @@ ht_string_hash(const char *s) for (b=0; b < head->hth_table_length; ++b) { \ struct type *e, **pE; \ for (pE = &new_table[b], e = *pE; e != NULL; e = *pE) { \ - b2 = e->field.hte_hash % new_len; \ + b2 = _HT_ELT_HASH(e, field, hashfn) % new_len; \ if (b2 == b) { \ pE = &e->field.hte_next; \ } else { \ @@ -390,9 +408,9 @@ ht_string_hash(const char *s) return 5; \ for (n = i = 0; i < head->hth_table_length; ++i) { \ for (elm = head->hth_table[i]; elm; elm = elm->field.hte_next) { \ - if (elm->field.hte_hash != hashfn(elm)) \ + if (_HT_ELT_HASH(elm, field, hashfn) != hashfn(elm)) \ return 1000 + i; \ - if ((elm->field.hte_hash % head->hth_table_length) != i) \ + if ((_HT_ELT_HASH(elm, field, hashfn) % head->hth_table_length) != i) \ return 10000 + i; \ ++n; \ } \ @@ -408,7 +426,7 @@ ht_string_hash(const char *s) #define _HT_FIND_OR_INSERT(name, field, hashfn, head, eltype, elm, var, y, n) \ { \ struct name *_##var##_head = head; \ - eltype **var; \ + struct eltype **var; \ if (!_##var##_head->hth_table || \ _##var##_head->hth_n_entries >= _##var##_head->hth_load_limit) \ name##_HT_GROW(_##var##_head, _##var##_head->hth_n_entries+1); \ @@ -422,7 +440,7 @@ ht_string_hash(const char *s) } #define _HT_FOI_INSERT(field, head, elm, newent, var) \ { \ - newent->field.hte_hash = (elm)->field.hte_hash; \ + _HT_SET_HASHVAL(newent, field, (elm)->field.hte_hash); \ newent->field.hte_next = NULL; \ *var = newent; \ ++((head)->hth_n_entries); \

1 0

[tor/master] Oops; there were a couple of typos in the upstream tinytest
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 8cae9c53b780fd24fcd0211f5fa86f1b66779a6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 17:48:43 2012 -0500 Oops; there were a couple of typos in the upstream tinytest --- src/test/tinytest_macros.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/tinytest_macros.h b/src/test/tinytest_macros.h index 92678c4..9ff69b1 100644 --- a/src/test/tinytest_macros.h +++ b/src/test/tinytest_macros.h @@ -68,7 +68,7 @@ TT_STMT_END /* Fail and abort the current test for the reason in msg */ -#define tt_abortprint_f(msg) TT_DIE(msg) +#define tt_abort_printf(msg) TT_DIE(msg) #define tt_abort_perror(op) TT_DIE(("%s: %s [%d]",(op),strerror(errno), errno)) #define tt_abort_msg(msg) TT_DIE(("%s", msg)) #define tt_abort() TT_DIE(("%s", "(Failed.)")) @@ -82,7 +82,7 @@ /* End the current test, and indicate we are skipping it. */ #define tt_skip() \ TT_STMT_BEGIN \ - _tinytest_set_test_skipped(); \ + tinytest_set_test_skipped_(); \ TT_EXIT_TEST_FUNCTION; \ TT_STMT_END

1 0

[tor/master] Synchronize with upstream tinytest again: remove _identifiers
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 9efee31fae1584c108a31fa407e32cc271d9bf10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 17:45:15 2012 -0500 Synchronize with upstream tinytest again: remove _identifiers --- changes/tinytest_update | 3 +- src/test/test.h | 8 ++-- src/test/test_addr.c | 8 ++-- src/test/test_dir.c | 2 +- src/test/tinytest.c | 30 +++++++++--------- src/test/tinytest.h | 16 +++++----- src/test/tinytest_macros.h | 76 ++++++++++++++++++++++---------------------- 7 files changed, 72 insertions(+), 71 deletions(-) diff --git a/changes/tinytest_update b/changes/tinytest_update index 069fc5a..7f76796 100644 --- a/changes/tinytest_update +++ b/changes/tinytest_update @@ -1,4 +1,5 @@ o Minor bugfixes: - Update to the latest version of the tinytest unit testing framework. This includes a couple of bugfixes that can be relevant for running - forked unit tests on Windows. + forked unit tests on Windows, and a removal of all reserved + identifiers. diff --git a/src/test/test.h b/src/test/test.h index 0fcb02a..1aa59f1 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -39,13 +39,13 @@ #define test_mem_op(expr1, op, expr2, len) \ tt_assert_test_fmt_type(expr1,expr2,#expr1" "#op" "#expr2, \ const char *, \ - (memcmp(_val1, _val2, len) op 0), \ + (memcmp(val1_, val2_, len) op 0), \ char *, "%s", \ { size_t printlen = (len)*2+1; \ - _print = tor_malloc(printlen); \ - base16_encode(_print, printlen, _value, \ + print_ = tor_malloc(printlen); \ + base16_encode(print_, printlen, value_, \ (len)); }, \ - { tor_free(_print); }, \ + { tor_free(print_); }, \ TT_EXIT_TEST_FUNCTION \ ); diff --git a/src/test/test_addr.c b/src/test/test_addr.c index cf9c8f9..3838b80 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -73,17 +73,17 @@ test_addr_basic(void) #define _test_op_ip6(a,op,b,e1,e2) \ STMT_BEGIN \ tt_assert_test_fmt_type(a,b,e1" "#op" "e2,struct in6_addr*, \ - (memcmp(_val1->s6_addr, _val2->s6_addr, 16) op 0), \ + (memcmp(val1_->s6_addr, val2_->s6_addr, 16) op 0), \ char *, "%s", \ { int i; char *cp; \ - cp = _print = tor_malloc(64); \ + cp = print_ = tor_malloc(64); \ for (i=0;i<16;++i) { \ - tor_snprintf(cp, 3,"%02x", (unsigned)_value->s6_addr[i]);\ + tor_snprintf(cp, 3,"%02x", (unsigned)value_->s6_addr[i]);\ cp += 2; \ if (i != 15) *cp++ = ':'; \ } \ }, \ - { tor_free(_print); }, \ + { tor_free(print_); }, \ TT_EXIT_TEST_FUNCTION \ ); \ STMT_END diff --git a/src/test/test_dir.c b/src/test/test_dir.c index fb23519..0ed54c3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -305,7 +305,7 @@ test_dir_versions(void) #define tt_versionstatus_op(vs1, op, vs2) \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \ - (_val1 op _val2),"%d",TT_EXIT_TEST_FUNCTION) + (val1_ op val2_),"%d",TT_EXIT_TEST_FUNCTION) #define test_v_i_o(val, ver, lst) \ tt_versionstatus_op(val, ==, tor_version_is_obsolete(ver, lst)) diff --git a/src/test/tinytest.c b/src/test/tinytest.c index 27fa94c..4d9afac 100644 --- a/src/test/tinytest.c +++ b/src/test/tinytest.c @@ -73,7 +73,7 @@ static void usage(struct testgroup_t *groups, int list_groups) __attribute__((noreturn)); static enum outcome -_testcase_run_bare(const struct testcase_t *testcase) +testcase_run_bare_(const struct testcase_t *testcase) { void *env = NULL; int outcome; @@ -100,7 +100,7 @@ _testcase_run_bare(const struct testcase_t *testcase) #define MAGIC_EXITCODE 42 static enum outcome -_testcase_run_forked(const struct testgroup_t *group, +testcase_run_forked_(const struct testgroup_t *group, const struct testcase_t *testcase) { #ifdef _WIN32 @@ -119,7 +119,7 @@ _testcase_run_forked(const struct testgroup_t *group, DWORD exitcode; if (!in_tinytest_main) { - printf("\nERROR. On Windows, _testcase_run_forked must be" + printf("\nERROR. On Windows, testcase_run_forked_ must be" " called from within tinytest_main.\n"); abort(); } @@ -165,7 +165,7 @@ _testcase_run_forked(const struct testgroup_t *group, int test_r, write_r; char b[1]; close(outcome_pipe[0]); - test_r = _testcase_run_bare(testcase); + test_r = testcase_run_bare_(testcase); assert(0<=(int)test_r && (int)test_r<=2); b[0] = "NYS"[test_r]; write_r = (int)write(outcome_pipe[1], b, 1); @@ -219,9 +219,9 @@ testcase_run_one(const struct testgroup_t *group, } if ((testcase->flags & TT_FORK) && !(opt_forked||opt_nofork)) { - outcome = _testcase_run_forked(group, testcase); + outcome = testcase_run_forked_(group, testcase); } else { - outcome = _testcase_run_bare(testcase); + outcome = testcase_run_bare_(testcase); } if (outcome == OK) { @@ -247,7 +247,7 @@ testcase_run_one(const struct testgroup_t *group, } int -_tinytest_set_flag(struct testgroup_t *groups, const char *arg, unsigned long flag) +tinytest_set_flag_(struct testgroup_t *groups, const char *arg, unsigned long flag) { int i, j; size_t length = LONGEST_TEST_NAME; @@ -279,7 +279,7 @@ usage(struct testgroup_t *groups, int list_groups) puts(" Use --list-tests for a list of tests."); if (list_groups) { puts("Known tests are:"); - _tinytest_set_flag(groups, "..", 0); + tinytest_set_flag_(groups, "..", 0); } exit(0); } @@ -322,28 +322,28 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups) } } else { const char *test = v[i]; - int flag = _TT_ENABLED; + int flag = TT_ENABLED_; if (test[0] == ':') { ++test; flag = TT_SKIP; } else { ++n; } - if (!_tinytest_set_flag(groups, test, flag)) { + if (!tinytest_set_flag_(groups, test, flag)) { printf("No such test as %s!\n", v[i]); return -1; } } } if (!n) - _tinytest_set_flag(groups, "..", _TT_ENABLED); + tinytest_set_flag_(groups, "..", TT_ENABLED_); setvbuf(stdout, NULL, _IONBF, 0); ++in_tinytest_main; for (i=0; groups[i].prefix; ++i) for (j=0; groups[i].cases[j].name; ++j) - if (groups[i].cases[j].flags & _TT_ENABLED) + if (groups[i].cases[j].flags & TT_ENABLED_) testcase_run_one(&groups[i], &groups[i].cases[j]); @@ -362,13 +362,13 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups) } int -_tinytest_get_verbosity(void) +tinytest_get_verbosity_(void) { return opt_verbosity; } void -_tinytest_set_test_failed(void) +tinytest_set_test_failed_(void) { if (opt_verbosity <= 0 && cur_test_name) { if (opt_verbosity==0) puts(""); @@ -379,7 +379,7 @@ _tinytest_set_test_failed(void) } void -_tinytest_set_test_skipped(void) +tinytest_set_test_skipped_(void) { if (cur_test_outcome==OK) cur_test_outcome = SKIP; diff --git a/src/test/tinytest.h b/src/test/tinytest.h index 7ce7858..bcac9f0 100644 --- a/src/test/tinytest.h +++ b/src/test/tinytest.h @@ -23,15 +23,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TINYTEST_H -#define _TINYTEST_H +#ifndef TINYTEST_H_INCLUDED_ +#define TINYTEST_H_INCLUDED_ /** Flag for a test that needs to run in a subprocess. */ #define TT_FORK (1<<0) /** Runtime flag for a test we've decided to skip. */ #define TT_SKIP (1<<1) /** Internal runtime flag for a test we've decided to run. */ -#define _TT_ENABLED (1<<2) +#define TT_ENABLED_ (1<<2) /** If you add your own flags, make them start at this point. */ #define TT_FIRST_USER_FLAG (1<<3) @@ -65,18 +65,18 @@ struct testgroup_t { #define END_OF_GROUPS { NULL, NULL} /** Implementation: called from a test to indicate failure, before logging. */ -void _tinytest_set_test_failed(void); +void tinytest_set_test_failed_(void); /** Implementation: called from a test to indicate that we're skipping. */ -void _tinytest_set_test_skipped(void); +void tinytest_set_test_skipped_(void); /** Implementation: return 0 for quiet, 1 for normal, 2 for loud. */ -int _tinytest_get_verbosity(void); +int tinytest_get_verbosity_(void); /** Implementation: Set a flag on tests matching a name; returns number * of tests that matched. */ -int _tinytest_set_flag(struct testgroup_t *, const char *, unsigned long); +int tinytest_set_flag_(struct testgroup_t *, const char *, unsigned long); /** Set all tests in 'groups' matching the name 'named' to be skipped. */ #define tinytest_skip(groups, named) \ - _tinytest_set_flag(groups, named, TT_SKIP) + tinytest_set_flag_(groups, named, TT_SKIP) /** Run a single testcase in a single group. */ int testcase_run_one(const struct testgroup_t *,const struct testcase_t *); diff --git a/src/test/tinytest_macros.h b/src/test/tinytest_macros.h index 1a07ad1..92678c4 100644 --- a/src/test/tinytest_macros.h +++ b/src/test/tinytest_macros.h @@ -23,8 +23,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _TINYTEST_MACROS_H -#define _TINYTEST_MACROS_H +#ifndef TINYTEST_MACROS_H_INCLUDED_ +#define TINYTEST_MACROS_H_INCLUDED_ /* Helpers for defining statement-like macros */ #define TT_STMT_BEGIN do { @@ -51,30 +51,30 @@ /* Announce a non-failure if we're verbose. */ #define TT_BLATHER(args) \ TT_STMT_BEGIN \ - if (_tinytest_get_verbosity()>1) TT_DECLARE(" OK", args); \ + if (tinytest_get_verbosity_()>1) TT_DECLARE(" OK", args); \ TT_STMT_END #define TT_DIE(args) \ TT_STMT_BEGIN \ - _tinytest_set_test_failed(); \ + tinytest_set_test_failed_(); \ TT_GRIPE(args); \ TT_EXIT_TEST_FUNCTION; \ TT_STMT_END #define TT_FAIL(args) \ TT_STMT_BEGIN \ - _tinytest_set_test_failed(); \ + tinytest_set_test_failed_(); \ TT_GRIPE(args); \ TT_STMT_END /* Fail and abort the current test for the reason in msg */ -#define tt_abort_printf(msg) TT_DIE(msg) +#define tt_abortprint_f(msg) TT_DIE(msg) #define tt_abort_perror(op) TT_DIE(("%s: %s [%d]",(op),strerror(errno), errno)) #define tt_abort_msg(msg) TT_DIE(("%s", msg)) #define tt_abort() TT_DIE(("%s", "(Failed.)")) /* Fail but do not abort the current test for the reason in msg. */ -#define tt_fail_printf(msg) TT_FAIL(msg) +#define tt_failprint_f(msg) TT_FAIL(msg) #define tt_fail_perror(op) TT_FAIL(("%s: %s [%d]",(op),strerror(errno), errno)) #define tt_fail_msg(msg) TT_FAIL(("%s", msg)) #define tt_fail() TT_FAIL(("%s", "(Failed.)")) @@ -86,10 +86,10 @@ TT_EXIT_TEST_FUNCTION; \ TT_STMT_END -#define _tt_want(b, msg, fail) \ +#define tt_want_(b, msg, fail) \ TT_STMT_BEGIN \ if (!(b)) { \ - _tinytest_set_test_failed(); \ + tinytest_set_test_failed_(); \ TT_GRIPE(("%s",msg)); \ fail; \ } else { \ @@ -99,11 +99,11 @@ /* Assert b, but do not stop the test if b fails. Log msg on failure. */ #define tt_want_msg(b, msg) \ - _tt_want(b, msg, ); + tt_want_(b, msg, ); /* Assert b and stop the test if b fails. Log msg on failure. */ #define tt_assert_msg(b, msg) \ - _tt_want(b, msg, TT_EXIT_TEST_FUNCTION); + tt_want_(b, msg, TT_EXIT_TEST_FUNCTION); /* Assert b, but do not stop the test if b fails. */ #define tt_want(b) tt_want_msg( (b), "want("#b")") @@ -113,28 +113,28 @@ #define tt_assert_test_fmt_type(a,b,str_test,type,test,printf_type,printf_fmt, \ setup_block,cleanup_block,die_on_fail) \ TT_STMT_BEGIN \ - type _val1 = (type)(a); \ - type _val2 = (type)(b); \ - int _tt_status = (test); \ - if (!_tt_status || _tinytest_get_verbosity()>1) { \ - printf_type _print; \ - printf_type _print1; \ - printf_type _print2; \ - type _value = _val1; \ + type val1_ = (type)(a); \ + type val2_ = (type)(b); \ + int tt_status_ = (test); \ + if (!tt_status_ || tinytest_get_verbosity_()>1) { \ + printf_type print_; \ + printf_type print1_; \ + printf_type print2_; \ + type value_ = val1_; \ setup_block; \ - _print1 = _print; \ - _value = _val2; \ + print1_ = print_; \ + value_ = val2_; \ setup_block; \ - _print2 = _print; \ - TT_DECLARE(_tt_status?" OK":"FAIL", \ + print2_ = print_; \ + TT_DECLARE(tt_status_?" OK":"FAIL", \ ("assert(%s): "printf_fmt" vs "printf_fmt, \ - str_test, _print1, _print2)); \ - _print = _print1; \ + str_test, print1_, print2_)); \ + print_ = print1_; \ cleanup_block; \ - _print = _print2; \ + print_ = print2_; \ cleanup_block; \ - if (!_tt_status) { \ - _tinytest_set_test_failed(); \ + if (!tt_status_) { \ + tinytest_set_test_failed_(); \ die_on_fail ; \ } \ } \ @@ -142,43 +142,43 @@ #define tt_assert_test_type(a,b,str_test,type,test,fmt,die_on_fail) \ tt_assert_test_fmt_type(a,b,str_test,type,test,type,fmt, \ - {_print=_value;},{},die_on_fail) + {print_=value_;},{},die_on_fail) /* Helper: assert that a op b, when cast to type. Format the values with * printf format fmt on failure. */ #define tt_assert_op_type(a,op,b,type,fmt) \ - tt_assert_test_type(a,b,#a" "#op" "#b,type,(_val1 op _val2),fmt, \ + tt_assert_test_type(a,b,#a" "#op" "#b,type,(val1_ op val2_),fmt, \ TT_EXIT_TEST_FUNCTION) #define tt_int_op(a,op,b) \ - tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2), \ + tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_), \ "%ld",TT_EXIT_TEST_FUNCTION) #define tt_uint_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long, \ - (_val1 op _val2),"%lu",TT_EXIT_TEST_FUNCTION) + (val1_ op val2_),"%lu",TT_EXIT_TEST_FUNCTION) #define tt_ptr_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,void*, \ - (_val1 op _val2),"%p",TT_EXIT_TEST_FUNCTION) + (val1_ op val2_),"%p",TT_EXIT_TEST_FUNCTION) #define tt_str_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \ - (strcmp(_val1,_val2) op 0),"<%s>",TT_EXIT_TEST_FUNCTION) + (strcmp(val1_,val2_) op 0),"<%s>",TT_EXIT_TEST_FUNCTION) #define tt_want_int_op(a,op,b) \ - tt_assert_test_type(a,b,#a" "#op" "#b,long,(_val1 op _val2),"%ld",(void)0) + tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_),"%ld",(void)0) #define tt_want_uint_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long, \ - (_val1 op _val2),"%lu",(void)0) + (val1_ op val2_),"%lu",(void)0) #define tt_want_ptr_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,void*, \ - (_val1 op _val2),"%p",(void)0) + (val1_ op val2_),"%p",(void)0) #define tt_want_str_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \ - (strcmp(_val1,_val2) op 0),"<%s>",(void)0) + (strcmp(val1_,val2_) op 0),"<%s>",(void)0) #endif

1 0

[tor/master] Synchronize with upstream tinytest.
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 3b47a11654e4a4fe4931cb7fdce08b75ac667be1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 17:28:15 2012 -0500 Synchronize with upstream tinytest. The big change here is a patch (first added to Libevent by Ed Day) to make sure that the CreateProcess forked-test trick works even when the main test program is invoked without its .exe suffix. --- changes/tinytest_update | 4 ++++ src/test/tinytest.c | 20 ++++++++++++-------- src/test/tinytest.h | 2 +- src/test/tinytest_demo.c | 2 +- src/test/tinytest_macros.h | 2 +- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/changes/tinytest_update b/changes/tinytest_update new file mode 100644 index 0000000..069fc5a --- /dev/null +++ b/changes/tinytest_update @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Update to the latest version of the tinytest unit testing framework. + This includes a couple of bugfixes that can be relevant for running + forked unit tests on Windows. diff --git a/src/test/tinytest.c b/src/test/tinytest.c index 8caa4f5..27fa94c 100644 --- a/src/test/tinytest.c +++ b/src/test/tinytest.c @@ -1,4 +1,4 @@ -/* tinytest.c -- Copyright 2009-2010 Nick Mathewson +/* tinytest.c -- Copyright 2009-2012 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -22,16 +22,15 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef TINYTEST_LOCAL +#include "tinytest_local.h" +#endif #include <stdio.h> #include <stdlib.h> #include <string.h> #include <assert.h> -#ifdef TINYTEST_LOCAL -#include "tinytest_local.h" -#endif - #ifdef _WIN32 #include <windows.h> #else @@ -66,8 +65,8 @@ const char *cur_test_prefix = NULL; /**< prefix of the current test group */ const char *cur_test_name = NULL; #ifdef _WIN32 -/** Pointer to argv[0] for win32. */ -static const char *commandname = NULL; +/* Copy of argv[0] for win32. */ +static char commandname[MAX_PATH+1]; #endif static void usage(struct testgroup_t *groups, int list_groups) @@ -291,7 +290,12 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups) int i, j, n=0; #ifdef _WIN32 - commandname = v[0]; + const char *sp = strrchr(v[0], '.'); + const char *extension = ""; + if (!sp || stricmp(sp, ".exe")) + extension = ".exe"; /* Add an exe so CreateProcess will work */ + snprintf(commandname, sizeof(commandname), "%s%s", v[0], extension); + commandname[MAX_PATH]='\0'; #endif for (i=1; i<c; ++i) { if (v[i][0] == '-') { diff --git a/src/test/tinytest.h b/src/test/tinytest.h index cbe28b7..7ce7858 100644 --- a/src/test/tinytest.h +++ b/src/test/tinytest.h @@ -1,4 +1,4 @@ -/* tinytest.h -- Copyright 2009-2010 Nick Mathewson +/* tinytest.h -- Copyright 2009-2012 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c index 98cb773..be95ce4 100644 --- a/src/test/tinytest_demo.c +++ b/src/test/tinytest_demo.c @@ -1,4 +1,4 @@ -/* tinytest_demo.c -- Copyright 2009-2010 Nick Mathewson +/* tinytest_demo.c -- Copyright 2009-2012 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/test/tinytest_macros.h b/src/test/tinytest_macros.h index 032393c..1a07ad1 100644 --- a/src/test/tinytest_macros.h +++ b/src/test/tinytest_macros.h @@ -1,4 +1,4 @@ -/* tinytest_macros.h -- Copyright 2009-2010 Nick Mathewson +/* tinytest_macros.h -- Copyright 2009-2012 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions

1 0

r25420: {website} bump all tbbs to 2.2.35-6 (website/trunk/include)
by Erinn Clark 13 Feb '12

13 Feb '12

Author: erinn Date: 2012-02-13 22:10:38 +0000 (Mon, 13 Feb 2012) New Revision: 25420 Modified: website/trunk/include/versions.wmi Log: bump all tbbs to 2.2.35-6 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-02-13 19:16:23 UTC (rev 25419) +++ website/trunk/include/versions.wmi 2012-02-13 22:10:38 UTC (rev 25420) @@ -27,30 +27,30 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.10-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-5</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-6</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>10.0</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>10.0.1</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> -<define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> +<define-tag version-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-5</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-5</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-6</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-6</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0g</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.1</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> -<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> +<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-5</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-5</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-6</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-6</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.1</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> -<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> +<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.15</define-tag>

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 13 Feb '12

13 Feb '12

commit 22ef2e992d641f5b8f3f168dc0ee605fa1df526e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 13 21:45:16 2012 +0000 Update translations for vidalia_alpha --- fr/vidalia.po | 88 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/fr/vidalia.po b/fr/vidalia.po index 8a73372..a87da42 100644 --- a/fr/vidalia.po +++ b/fr/vidalia.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-03 14:28+0000\n" -"PO-Revision-Date: 2012-02-13 21:14+0000\n" +"PO-Revision-Date: 2012-02-13 21:37+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1380,15 +1380,15 @@ msgstr "Se connecter à Tor automatiquement" msgctxt "GraphFrame" msgid "%1 KB/s" -msgstr "%1 KB/s" +msgstr "%1 Ko/s" msgctxt "GraphFrame" msgid "%1 KB" -msgstr "%1 KB" +msgstr "%1 Ko" msgctxt "GraphFrame" msgid "%1 MB" -msgstr "%1 MB" +msgstr "%1 Mo" msgctxt "GraphFrame" msgid "%1 GB" @@ -2404,11 +2404,11 @@ msgstr "-" msgctxt "NetViewer" msgid "Zoom To Fit" -msgstr "" +msgstr "Adapter le zoom" msgctxt "NetViewer" msgid "Zooms to fit all currently displayed circuits" -msgstr "" +msgstr "Adapter le zoom à l'ensemble des circuits actuellement affichés" msgctxt "NetViewer" msgid "Ctrl+Z" @@ -2470,21 +2470,21 @@ msgctxt "NetworkPage" msgid "" "You must specify both an IP address or hostname and a port number to " "configure Tor to use a proxy to access the Internet." -msgstr "" +msgstr "Vous devez indiquer une adresse IP ou un nom d'hôte et un numéro de port pour que Tor puisse utiliser le serveur mandataire (proxy) et accéder à Internet." msgctxt "NetworkPage" msgid "" "You must specify one or more ports to which your firewall allows you to " "connect." -msgstr "" +msgstr "Vous devez indiquer un ou plusieurs ports que votre pare feu autorise pour vous connecter." msgctxt "NetworkPage" msgid "'%1' is not a valid port number." -msgstr "" +msgstr "'%1' n'est pas un numéro de port valide." msgctxt "NetworkPage" msgid "Check if your local network requires a proxy to access the Internet" -msgstr "" +msgstr "Cochez si votre réseau local a besoin d'un proxy mandataire pour accéder à Internet" msgctxt "NetworkPage" msgid "I use a proxy to access the Internet" @@ -2508,11 +2508,11 @@ msgstr "Port:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" -msgstr "" +msgstr "Cochez pour se connecter uniquement au relais en utilisant les ports autorisés par votre parefeu." msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" -msgstr "" +msgstr "Mon parefeu me laisse me connecter seulement à certains ports" msgctxt "NetworkPage" msgid "Firewall Settings" @@ -2530,19 +2530,19 @@ msgctxt "NetworkPage" msgid "" "Check to encrypt directory requests and, optionally, use bridge relays to " "access the Tor network" -msgstr "" +msgstr "Cochez pour chiffrer les demandes d'annuaire et, facultativement, utilisez les relais pont pour accéder au réseau Tor." msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" -msgstr "" +msgstr "Mon fournisseur d'accès à Internet bloque les connexions au réseau Tor" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "" +msgstr "Paramètres du Pont" msgctxt "NetworkPage" msgid "Add a Bridge:" -msgstr "" +msgstr "Ajouter un pont :" msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" @@ -2554,7 +2554,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Find Bridges Now" -msgstr "" +msgstr "Rechercher maintenant des passerelles" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>" @@ -2676,11 +2676,11 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Name:" -msgstr "" +msgstr "Nom :" msgctxt "RouterInfoDialog" msgid "Status:" -msgstr "" +msgstr "État :" msgctxt "RouterInfoDialog" msgid "Location:" @@ -2688,7 +2688,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "IP Address:" -msgstr "" +msgstr "Adresse IP :" msgctxt "RouterInfoDialog" msgid "Platform:" @@ -2724,7 +2724,7 @@ msgstr "" msgctxt "RouterListItem" msgid "%1 KB/s" -msgstr "" +msgstr "%1 Ko/s" msgctxt "RouterListWidget" msgid "Relay" @@ -2740,11 +2740,11 @@ msgstr "%1 relais en ligne" msgctxt "RouterListWidget" msgid "Copy" -msgstr "" +msgstr "Copier" msgctxt "RouterListWidget" msgid "Nickname" -msgstr "" +msgstr "Surnom" msgctxt "RouterListWidget" msgid "Fingerprint" @@ -2768,7 +2768,7 @@ msgstr "" msgctxt "ServerPage" msgid "Your bridge relay is not running." -msgstr "" +msgstr "Votre relais passerelle n'est pas actif." msgctxt "ServerPage" msgid "You must specify at least a relay nickname and port." @@ -2792,7 +2792,7 @@ msgstr "" msgctxt "ServerPage" msgid "Test" -msgstr "" +msgstr "Test" msgctxt "ServerPage" msgid "Show help topic on port forwarding" @@ -2808,7 +2808,7 @@ msgstr "" msgctxt "ServerPage" msgid "Contact Info:" -msgstr "" +msgstr "Info. de contact :" msgctxt "ServerPage" msgid "Name of your relay" @@ -2820,11 +2820,11 @@ msgstr "" msgctxt "ServerPage" msgid "Nickname:" -msgstr "" +msgstr "Surnom :" msgctxt "ServerPage" msgid "Basic Settings" -msgstr "" +msgstr "Options de base" msgctxt "ServerPage" msgid "" @@ -2834,19 +2834,19 @@ msgstr "" msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" -msgstr "Cable/DSL 256 Kbps" +msgstr "Cable/ADSL 256 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 512 Kbps" -msgstr "Cable/DSL 512 Kbps" +msgstr "Cable/ADSL 512 Kbps" msgctxt "ServerPage" msgid "Cable/DSL 768 Kbps" -msgstr "Cable/DSL 768 Kbps" +msgstr "Cable/ADSL 768 Kbps" msgctxt "ServerPage" msgid "T1/Cable/DSL 1.5 Mbps" -msgstr "T1/Cable/DSL 1.5 Mbps" +msgstr "T1/Cable/ADSL 1.5 Mbps" msgctxt "ServerPage" msgid "> 1.5 Mbps" @@ -2874,7 +2874,7 @@ msgstr "" msgctxt "ServerPage" msgid "KB/s" -msgstr "" +msgstr "Ko/s" msgctxt "ServerPage" msgid "Maximum Rate" @@ -2908,7 +2908,7 @@ msgstr "Ports 110, 143, 993 et 995" msgctxt "ServerPage" msgid "Retrieve Mail (POP, IMAP)" -msgstr "" +msgstr "Téléchargement des emails (POP, IMAP)" msgctxt "ServerPage" msgid "Ports unspecified by other checkboxes" @@ -3100,23 +3100,23 @@ msgstr "" msgctxt "ServicePage" msgid "Add new service to list" -msgstr "" +msgstr "Ajouter un nouveau service à la liste" msgctxt "ServicePage" msgid "Remove selected service from list" -msgstr "" +msgstr "Supprimer le service selectionné de la liste" msgctxt "ServicePage" msgid "Copy onion address of selected service to clipboard" -msgstr "" +msgstr "Copier l'adresse onion du service sélectionné dans le presse-papiers." msgctxt "ServicePage" msgid "Browse in local file system and choose directory for selected service" -msgstr "" +msgstr "Parcourez le système de fichiers et choisissez le dossier du service sélectionné" msgctxt "ServicePage" msgid "Created by Tor" -msgstr "" +msgstr "Créé par Tor" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3124,15 +3124,15 @@ msgstr "Copier dans le Presse Papier" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Le programme Tor est en cours d’exécution" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Vous utilisez actuellement la version \"%1\" du programme Tor." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Le programme Tor n'est pas en cours d’exécution" msgctxt "StatusEventWidget" msgid "" @@ -3780,11 +3780,11 @@ msgstr "%1 B/s" msgctxt "stringutil.h" msgid "%1 KB/s" -msgstr "%1 KB/s" +msgstr "%1 Ko/s" msgctxt "stringutil.h" msgid "%1 MB/s" -msgstr "%1 MB/s" +msgstr "%1 Mo/s" msgctxt "stringutil.h" msgid "%1 GB/s"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 13 Feb '12

13 Feb '12

commit a142aa5f6d25e89918870de980d25a23277e13c3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 13 21:15:17 2012 +0000 Update translations for vidalia_alpha --- fr/vidalia.po | 88 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/fr/vidalia.po b/fr/vidalia.po index 05b281e..8a73372 100644 --- a/fr/vidalia.po +++ b/fr/vidalia.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-03 14:28+0000\n" -"PO-Revision-Date: 2012-02-13 20:40+0000\n" +"PO-Revision-Date: 2012-02-13 21:14+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1956,7 +1956,7 @@ msgctxt "MainWindow" msgid "" "One of your applications%1appears to be making a potentially unencrypted and" " unsafe connection to port %2." -msgstr "" +msgstr "Une de vos applications%1apparaît effectuer une connexion non chiffrée et non sécurisée sur le port %2." msgctxt "MainWindow" msgid "" @@ -2045,7 +2045,7 @@ msgstr "Erreur lors de l'application d'un filtre" msgctxt "MessageLog" msgid "Vidalia was unable to register for Tor's log events." -msgstr "" +msgstr "Vidalia n'a pas pu s'enregistrer pour recevoir les événements de Tor." msgctxt "MessageLog" msgid "Error Opening Log File" @@ -2053,23 +2053,23 @@ msgstr "Erreur d'ouverture du journal des messages" msgctxt "MessageLog" msgid "Vidalia was unable to open the specified log file." -msgstr "" +msgstr "Vidalia n'a pas pu ouvrir le fichier des messages défini." msgctxt "MessageLog" msgid "Log Filename Required" -msgstr "Nom du fichier journal requis" +msgstr "Le nom de fichier du Journal des messages est requis" msgctxt "MessageLog" msgid "You must enter a filename to be able to save log messages to a file." -msgstr "" +msgstr "Vous devez entrer un nom de fichier pour pouvoir enregistrer les messages dans un fichier." msgctxt "MessageLog" msgid "Select Log File" -msgstr "" +msgstr "Sélectionner le journal des messages" msgctxt "MessageLog" msgid "Save Log Messages" -msgstr "" +msgstr "Enregistrer le Journal des messages" msgctxt "MessageLog" msgid "Text Files (*.txt)" @@ -2081,7 +2081,7 @@ msgstr "Vidalia" msgctxt "MessageLog" msgid "Find in Message Log" -msgstr "" +msgstr "Chercher dans le Journal des messages" msgctxt "MessageLog" msgid "Find:" @@ -2093,7 +2093,7 @@ msgstr "Non Trouvé" msgctxt "MessageLog" msgid "Search found 0 matches." -msgstr "" +msgstr "La recherche a trouvé 0 résultat." msgctxt "MessageLog" msgid "Message Log" @@ -2101,27 +2101,27 @@ msgstr "Journal des messages" msgctxt "MessageLog" msgid "Message Filters..." -msgstr "" +msgstr "Filtres des messages..." msgctxt "MessageLog" msgid "Set message filters" -msgstr "" +msgstr "Définir les filtres des messages" msgctxt "MessageLog" msgid "History Size..." -msgstr "" +msgstr "Taille de l'historique..." msgctxt "MessageLog" msgid "Set maximum number of messages to display" -msgstr "" +msgstr "Définir le nombre maximal de messages à afficher" msgctxt "MessageLog" msgid "Clear" -msgstr "" +msgstr "Effacer" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" -msgstr "" +msgstr "Effacer tout l'historique du Journal des messages (Ctrl+E)" msgctxt "MessageLog" msgid "Ctrl+E" @@ -2153,19 +2153,19 @@ msgstr "Ctrl+A" msgctxt "MessageLog" msgid "Save All" -msgstr "" +msgstr "Enregistrer tout" msgctxt "MessageLog" msgid "Save all messages to a file" -msgstr "" +msgstr "Enregistrer tous les messages dans un fichier" msgctxt "MessageLog" msgid "Save Selected" -msgstr "" +msgstr "Enregistrer la sélection" msgctxt "MessageLog" msgid "Save selected messages to a file" -msgstr "" +msgstr "Enregistrer les messages sélectionnés dans un fichier" msgctxt "MessageLog" msgid "Settings" @@ -2173,7 +2173,7 @@ msgstr "Paramètres" msgctxt "MessageLog" msgid "Adjust Message Log Settings" -msgstr "" +msgstr "Ajuster les options du Journal des messages" msgctxt "MessageLog" msgid "Ctrl+T" @@ -2185,7 +2185,7 @@ msgstr "Aide" msgctxt "MessageLog" msgid "Show the help browser" -msgstr "" +msgstr "Parcourir l'aide" msgctxt "MessageLog" msgid "F1" @@ -2209,7 +2209,7 @@ msgstr "Rechercher" msgctxt "MessageLog" msgid "Find all messages containing the search text (Ctrl+F)" -msgstr "" +msgstr "Trouver les messages contenant ce texte (Ctrl+F)" msgctxt "MessageLog" msgid "Ctrl+F" @@ -2217,11 +2217,11 @@ msgstr "Ctrl+F" msgctxt "MessageLog" msgid "Time" -msgstr "" +msgstr "Heure" msgctxt "MessageLog" msgid "Type" -msgstr "" +msgstr "Type" msgctxt "MessageLog" msgid "Message" @@ -2229,15 +2229,15 @@ msgstr "Message" msgctxt "MessageLog" msgid "Saves the current Message Log settings" -msgstr "" +msgstr "Enregistrer les options actuelles du Journal des messages" msgctxt "MessageLog" msgid "Save Settings" -msgstr "" +msgstr "Enregistrer les paramètres" msgctxt "MessageLog" msgid "Cancels changes made to settings" -msgstr "" +msgstr "Annuler les modifications" msgctxt "MessageLog" msgid "Cancel" @@ -2245,7 +2245,7 @@ msgstr "Annuler" msgctxt "MessageLog" msgid "Message Filter" -msgstr "" +msgstr "Filtrage des messages" msgctxt "MessageLog" msgid "Error" @@ -2269,11 +2269,11 @@ msgstr "Debug" msgctxt "MessageLog" msgid "Message Log History" -msgstr "" +msgstr "Historique du Journal" msgctxt "MessageLog" msgid "Number of messages to display in the message log window" -msgstr "" +msgstr "Nombre de messages à afficher dans la fenêtre du Journal des messages" msgctxt "MessageLog" msgid "messages" @@ -2285,25 +2285,25 @@ msgstr "Parcourir" msgctxt "MessageLog" msgid "Enable automatically saving all new log messages to a file" -msgstr "" +msgstr "Activer l'enregistrement automatique de tous les messages du Journal" msgctxt "MessageLog" msgid "Automatically save new log messages to a file" -msgstr "" +msgstr "Enregistrer les nouveaux messages automatiquement dans un fichier" msgctxt "MessageLog" msgid "Always Save New Log Messages" -msgstr "" +msgstr "Toujours enregistrer les nouveaux messages du Journal" msgctxt "MessageLog" msgid "toolbar" -msgstr "" +msgstr "Barre d'outils" msgctxt "MessageLog" msgid "" "Messages that appear when something has \n" "gone very wrong and Tor cannot proceed." -msgstr "" +msgstr "Les messages qui apparaissent quand un problème sérieux vient d'arriver et que Tor ne peut continuer." msgctxt "MessageLog" msgid "" @@ -2356,11 +2356,11 @@ msgstr "Aide" msgctxt "NetViewer" msgid "Show the network map help" -msgstr "" +msgstr "Voir l'aide de la carte du réseau" msgctxt "NetViewer" msgid "Show network map help" -msgstr "" +msgstr "Voir l'aide de la carte du réseau" msgctxt "NetViewer" msgid "F1" @@ -2384,7 +2384,7 @@ msgstr "Zoom Avant" msgctxt "NetViewer" msgid "Zoom in on the network map" -msgstr "" +msgstr "Zoom avant sur la carte du réseau" msgctxt "NetViewer" msgid "+" @@ -2396,7 +2396,7 @@ msgstr "Zoom Arrière" msgctxt "NetViewer" msgid "Zoom out on the network map" -msgstr "" +msgstr "Zoom arrière sur la carte du réseau" msgctxt "NetViewer" msgid "-" @@ -2424,7 +2424,7 @@ msgstr "Pas de détails disponibles pour le relai sélectionné." msgctxt "NetViewer" msgid "Unknown" -msgstr "" +msgstr "Unknown" msgctxt "NetViewer" msgid "Full Screen" @@ -2432,7 +2432,7 @@ msgstr "Plein écran" msgctxt "NetViewer" msgid "View the network map as a full screen window" -msgstr "" +msgstr "Voir la carte du réseau en plein écran" msgctxt "NetViewer" msgid "Ctrl+F" @@ -2456,11 +2456,11 @@ msgstr "Statut" msgctxt "NetworkPage" msgid "Invalid Bridge" -msgstr "" +msgstr "Pont invalide" msgctxt "NetworkPage" msgid "The specified bridge identifier is not valid." -msgstr "" +msgstr "L'identifiant du pont défini est invalide." msgctxt "NetworkPage" msgid "Copy (Ctrl+C)"

1 0

[torbrowser/maint-2.2] bump libevent library names for the latest release
by erinn＠torproject.org 13 Feb '12

13 Feb '12

commit 81ee46759ecf4221883f385a359ec438e8ef5d61 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Feb 13 21:46:41 2012 +0100 bump libevent library names for the latest release --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 24a4d90..51bcc08 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -284,9 +284,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.4 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.4 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.4 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.5 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.5 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.5 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR)

1 0

[torbrowser/maint-2.3] begin building vidalia for i386 and x86_64 now that we're using a newer version of qt
by erinn＠torproject.org 13 Feb '12

13 Feb '12

commit 3484dad86d601d9d04002e829bb7c3252b3c2083 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Feb 13 21:43:08 2012 +0100 begin building vidalia for i386 and x86_64 now that we're using a newer version of qt --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6607367..7cc57ce 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -81,7 +81,7 @@ build-qt: cd $(QT_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DOSX_TIGER_COMPAT=1 -DCMAKE_OSX_ARCHITECTURES=i386 -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ +VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ -DCMAKE_BUILD_TYPE=debug .. build-vidalia: export MACOSX_DEPLOYMENT_TARGET=10.5

1 0