December 2019 - tor-commits - lists.torproject.org

[translation/tails-greeter-2] https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2
by translation＠torproject.org 03 Dec '19

03 Dec '19

commit 3a8656228cab8393b2421283f9695124e7a89b4a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 3 03:49:02 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2 --- ia/ia.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ia/ia.po b/ia/ia.po index 33e7a19df8..98d52e112b 100644 --- a/ia/ia.po +++ b/ia/ia.po @@ -3,6 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# Translators: +# SoftInterlingua <>, 2019 +# #, fuzzy msgid "" msgstr "" @@ -10,6 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-11 00:25+0200\n" "PO-Revision-Date: 2016-11-18 21:29+0000\n" +"Last-Translator: SoftInterlingua <>, 2019\n" "Language-Team: Interlingua (https://www.transifex.com/otf/teams/1519/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -252,7 +256,7 @@ msgstr "" #: ../tailsgreeter/gui.py:602 msgid "Cancel" -msgstr "" +msgstr "Cancellar" #: ../tailsgreeter/gui.py:608 msgid "Add"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 03 Dec '19

03 Dec '19

commit a541f8306f23a2089ff729ae322ec48893f2fdbc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 3 03:48:27 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ia.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ia.po b/ia.po index 07095d619a..4f3748915b 100644 --- a/ia.po +++ b/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-28 17:02+0100\n" -"PO-Revision-Date: 2013-07-25 09:07+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2019-12-03 03:32+0000\n" +"Last-Translator: SoftInterlingua <>\n" "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 03 Dec '19

03 Dec '19

commit b4797c516263a50814064ed1e3bef836c9f3e84d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 3 03:47:22 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ia.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ia.po b/ia.po index 07095d619a..b4eb9595d9 100644 --- a/ia.po +++ b/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-28 17:02+0100\n" -"PO-Revision-Date: 2013-07-25 09:07+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2019-12-03 03:32+0000\n" +"Last-Translator: SoftInterlingua <>\n" "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +104,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119 #: config/chroot_local-includes/usr/local/bin/tor-browser:49 msgid "Cancel" -msgstr "" +msgstr "Cancellar" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46 msgid "Add"

1 0

[translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
by translation＠torproject.org 03 Dec '19

03 Dec '19

commit 606eeaa2faf7dd654f1c7d8a39d6d2e37eac4a34 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 3 03:46:18 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- ia/ia.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ia/ia.po b/ia/ia.po index 45ce71d2d9..ac5e4f5035 100644 --- a/ia/ia.po +++ b/ia/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-21 09:03+0200\n" -"PO-Revision-Date: 2012-10-03 17:40+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2019-12-03 03:32+0000\n" +"Last-Translator: SoftInterlingua <>\n" "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -413,7 +413,7 @@ msgstr "" #: ../tails_installer/gui.py:738 msgid "Cancel" -msgstr "" +msgstr "Cancellar" #: ../tails_installer/gui.py:774 msgid "Unable to mount device"

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 03 Dec '19

03 Dec '19

commit 1d0b659fee249c3106b532ce7e59e3d3df010029 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 3 03:46:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- ia/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ia/https-everywhere.dtd b/ia/https-everywhere.dtd index 6fdbd7cb8b..1327b98028 100644 --- a/ia/https-everywhere.dtd +++ b/ia/https-everywhere.dtd @@ -19,7 +19,7 @@ <!ENTITY https-everywhere.menu.showCounter "Show Counter"> <!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> -<!ENTITY https-everywhere.options.settings "Settings"> +<!ENTITY https-everywhere.options.settings "Configurationes"> <!ENTITY https-everywhere.options.generalSettings "General Settings"> <!ENTITY https-everywhere.options.advancedSettings "Advanced Settings"> <!ENTITY https-everywhere.options.updateChannels "Update Channels"> @@ -31,7 +31,7 @@ <!ENTITY https-everywhere.options.updateChannelsWarning "Warning: Adding update channels can cause attackers to hijack your browser. Only edit this section if you know what you're doing!"> <!ENTITY https-everywhere.options.addUpdateChannel "Add Update Channel"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Enter update channel name"> -<!ENTITY https-everywhere.options.delete "Delete"> +<!ENTITY https-everywhere.options.delete "Deler"> <!ENTITY https-everywhere.options.update "Update"> <!ENTITY https-everywhere.options.storedRulesetsVersion "Stored rulesets version: "> <!ENTITY https-everywhere.options.updatesLastChecked "Updates last checked: "> @@ -65,4 +65,4 @@ <!ENTITY https-everywhere.chrome.rule_name "Rule name"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> <!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Cancellar">

1 0

[tor/master] checkSpace.pl: make output more uniform.
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 2aaa7ae6e2559d4fa62efc57b1cf2660868d9323 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 26 12:49:13 2019 -0500 checkSpace.pl: make output more uniform. There were lots of slight differences in indentation and formatting among the in-file error messages. --- scripts/maint/checkSpace.pl | 51 ++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index 7be7f2a3c..f4e6f733c 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -4,9 +4,16 @@ use strict; use warnings; my $found = 0; +my $COLON_POS = 10; + sub msg { $found = 1; - print "$_[0]"; + my $v = shift; + $v =~ /^\s*([^:]+):(.*)$/; + chomp(my $errtype = $1); + my $rest = $2; + my $padding = ' ' x ($COLON_POS - length $errtype); + print "$padding$errtype:$rest\n"; } my $C = 0; @@ -29,7 +36,7 @@ for my $fn (@ARGV) { my $basename = $fn; $basename =~ s#.*/##; if ($basenames{$basename}) { - msg "Duplicate fnames: $fn and $basenames{$basename}.\n"; + msg "dup fname:$fn (same as $basenames{$basename}).\n"; } else { $basenames{$basename} = $fn; } @@ -42,12 +49,12 @@ for my $fn (@ARGV) { # (We insist on lines that end with a single LF character, not # CR LF.) if (/\r/) { - msg " CR:$fn:$.\n"; + msg "CR:$fn:$.\n"; } ## Warn about tabs. # (We only use spaces) if (/\t/) { - msg " TAB:$fn:$.\n"; + msg "TAB:$fn:$.\n"; } ## Warn about labels that don't have a space in front of them # (We indent every label at least one space) @@ -63,12 +70,12 @@ for my $fn (@ARGV) { ## Warn about control keywords without following space. # (We put a space after every 'if', 'while', 'for', 'switch', etc) if ($C && /\s(?:if|while|for|switch)\(/) { - msg " KW(:$fn:$.\n"; + msg "KW(:$fn:$.\n"; } ## Warn about #else #if instead of #elif. # (We only allow #elif) if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { - msg " #else#if:$fn:$.\n"; + msg "#else#if:$fn:$.\n"; } ## Warn about some K&R violations # (We use K&R-style C, where open braces go on the same line as @@ -83,19 +90,19 @@ for my $fn (@ARGV) { msg "non-K&R {:$fn:$.\n"; } if (/^\s*else/ and $lastline =~ /\}$/) { - msg " }\\nelse:$fn:$.\n"; + msg "}\\nelse:$fn:$.\n"; } $lastline = $_; ## Warn about unnecessary empty lines. # (Don't put an empty line before a line that contains nothing # but a closing brace.) if ($lastnil && /^\s*}\n/) { - msg " UnnecNL:$fn:$.\n"; + msg "UnnecNL:$fn:$.\n"; } ## Warn about multiple empty lines. # (At most one blank line in a row.) if ($lastnil && /^$/) { - msg " DoubleNL:$fn:$.\n"; + msg "DoubleNL:$fn:$.\n"; } elsif (/^$/) { $lastnil = 1; } else { @@ -105,7 +112,7 @@ for my $fn (@ARGV) { ## accept double-line lines. # (Don't make lines wider than 80 characters, including newline.) if (/^.{80}/) { - msg " Wide:$fn:$.\n"; + msg "Wide:$fn:$.\n"; } ### Juju to skip over comments and strings, since the tests ### we're about to do are okay there. @@ -146,26 +153,26 @@ for my $fn (@ARGV) { next if /^\#/; ## Skip C++-style comments. if (m!//!) { - # msg " //:$fn:$.\n"; + # msg "//:$fn:$.\n"; s!//.*!!; } ## Warn about unquoted braces preceded by non-space. # (No character except a space should come before a {) if (/([^\s'])\{/) { - msg " $1\{:$fn:$.\n"; + msg "$1\{:$fn:$.\n"; } ## Warn about double semi-colons at the end of a line. if (/;;$/) { - msg " double semi-colons at the end of $. in $fn\n" + msg ";;:$fn:$.\n" } ## Warn about multiple internal spaces. #if (/[^\s,:]\s{2,}[^\s\\=]/) { - # msg " X X:$fn:$.\n"; + # msg "X X:$fn:$.\n"; #} ## Warn about { with stuff after. #s/\s+$//; #if (/\{[^\}\\]+$/) { - # msg " {X:$fn:$.\n"; + # msg "{X:$fn:$.\n"; #} ## Warn about function calls with space before parens. # (Don't put a space between the name of a function and its @@ -177,7 +184,7 @@ for my $fn (@ARGV) { $1 ne "void" and $1 ne "__attribute__" and $1 ne "op" and $1 ne "size_t" and $1 ne "double" and $1 ne "uint64_t" and $1 ne "workqueue_reply_t" and $1 ne "bool") { - msg " fn ():$fn:$.\n"; + msg "fn ():$fn:$.\n"; } } ## Warn about functions not declared at start of line. @@ -206,28 +213,28 @@ for my $fn (@ARGV) { ## Check for forbidden functions except when they are # explicitly permitted if (/\bassert\(/ && not /assert OK/) { - msg "assert :$fn:$. (use tor_assert)\n"; + msg "assert:$fn:$. (use tor_assert)\n"; } if (/\bmemcmp\(/ && not /memcmp OK/) { - msg "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; + msg "memcmp:$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n"; } # always forbidden. if (not /\ OVERRIDE\ /) { if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) { - msg "$& :$fn:$.\n"; + msg "$&:$fn:$.\n"; } if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) { - msg "$& :$fn:$. (use tor_malloc, tor_free, etc)\n"; + msg "$&:$fn:$. (use tor_malloc, tor_free, etc)\n"; } } } } if ($isheader && $C) { if ($seenguard < 2) { - msg "$fn:No #ifndef/#define header guard pair found.\n"; + msg "noguard:$fn (No #ifndef/#define header guard pair found)\n"; } elsif ($guardnames{$guardname}) { - msg "$fn:Guard macro $guardname also used in $guardnames{$guardname}\n"; + msg "dupguard:$fn (Guard macro $guardname also used in $guardnames{$guardname})\n"; } else { $guardnames{$guardname} = $fn; }

1 0

[tor/master] Add a simple test for checkSpace.pl
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit bd61a4e84891027dfabba6be62886f3baeb41e27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 26 13:10:39 2019 -0500 Add a simple test for checkSpace.pl This script is not expected to work on windows due to line-ending issues, so I'm not making it get run on an automated basis. We should use it when editing checkSpace.pl. Closes ticket 32613. --- scripts/maint/checkSpaceTest.sh | 23 +++++++ scripts/maint/checkspace_tests/dubious.c | 83 +++++++++++++++++++++++++ scripts/maint/checkspace_tests/dubious.h | 4 ++ scripts/maint/checkspace_tests/expected.txt | 31 +++++++++ scripts/maint/checkspace_tests/good_guard.h | 6 ++ scripts/maint/checkspace_tests/same_guard.h | 6 ++ scripts/maint/checkspace_tests/subdir/dubious.c | 1 + 7 files changed, 154 insertions(+) diff --git a/scripts/maint/checkSpaceTest.sh b/scripts/maint/checkSpaceTest.sh new file mode 100755 index 000000000..a1eea58eb --- /dev/null +++ b/scripts/maint/checkSpaceTest.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# Copyright 2019, The Tor Project, Inc. +# See LICENSE for licensing information + +# Integration test for checkSpace.pl, which we want to rewrite. + +umask 077 +set -e + +# make a safe space for temporary files +DATA_DIR=$(mktemp -d -t tor_checkspace_tests.XXXXXX) +trap 'rm -rf "$DATA_DIR"' 0 + +RECEIVED_FNAME="${DATA_DIR}/got.txt" + +cd "$(dirname "$0")/checkspace_tests" + +# we expect this to give an error code. +../checkSpace.pl -C ./*.[ch] ./*/*.[ch] > "${RECEIVED_FNAME}" && exit 1 + +diff -u expected.txt "${RECEIVED_FNAME}" || exit 1 + +echo "OK" diff --git a/scripts/maint/checkspace_tests/dubious.c b/scripts/maint/checkspace_tests/dubious.c new file mode 100644 index 000000000..59c5f8e4f --- /dev/null +++ b/scripts/maint/checkspace_tests/dubious.c @@ -0,0 +1,83 @@ + +// The { coming up should be on its own line. +int +foo(void) { + // There should be a space before (1) + if(1) x += 1; + + // The following empty line is unnecessary. + +} + + +// There should be a newline between void and bar. +void bar(void) +{ + // too wide: + testing("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); +} + +long +bad_spacing() +{ + // here comes a tab + return 2; + // here comes a label without space: +foo: + ; +} + +// Here comes a CR: + +// Trailing space: + +int +non_k_and_r(void) +{ + // non-k&r + if (foo) + { + // double-semi + return 1;; + } + else + { + return 2; + } +} + +// #else #if causes a warning. +#if 1 +#else +#if 2 +#else +#endif +#endif + +// always space before a brace. +foo{ +} + +void +unexpected_space(void) +{ + // This space gives a warning. + foobar (77); +} + +void +bad_function_calls(long) +{ + // These are forbidden: + assert(1); + memcmp("a","b",1); + strcat(foo,x); + strcpy(foo,y); + sprintf(foo,"x"); + malloc(7); + free(p); + realloc(p); + strdup(s); + strndup(s,10); + calloc(a,b); +} diff --git a/scripts/maint/checkspace_tests/dubious.h b/scripts/maint/checkspace_tests/dubious.h new file mode 100644 index 000000000..744ec3395 --- /dev/null +++ b/scripts/maint/checkspace_tests/dubious.h @@ -0,0 +1,4 @@ + +// no guards. + +int foo(int); diff --git a/scripts/maint/checkspace_tests/expected.txt b/scripts/maint/checkspace_tests/expected.txt new file mode 100644 index 000000000..935b750ef --- /dev/null +++ b/scripts/maint/checkspace_tests/expected.txt @@ -0,0 +1,31 @@ + fn() {:./dubious.c:4 + KW(:./dubious.c:6 + UnnecNL:./dubious.c:10 + DoubleNL:./dubious.c:12 + tp fn():./dubious.c:15 + Wide:./dubious.c:17 + TAB:./dubious.c:24 + nosplabel:./dubious.c:26 + CR:./dubious.c:30 + Space@EOL:./dubious.c:32 + non-K&R {:./dubious.c:39 + ;;:./dubious.c:41 + }\nelse:./dubious.c:43 + #else#if:./dubious.c:52 + o{:./dubious.c:58 + fn() {:./dubious.c:58 + fn ():./dubious.c:65 + assert:./dubious.c:72 (use tor_assert) + memcmp:./dubious.c:73 (use {tor,fast}_mem{eq,neq,cmp} + strcat(:./dubious.c:74 + strcpy(:./dubious.c:75 + sprintf(:./dubious.c:76 + malloc(:./dubious.c:77 (use tor_malloc, tor_free, etc) + free(:./dubious.c:78 (use tor_malloc, tor_free, etc) + realloc(:./dubious.c:79 (use tor_malloc, tor_free, etc) + strdup(:./dubious.c:80 (use tor_malloc, tor_free, etc) + strndup(:./dubious.c:81 (use tor_malloc, tor_free, etc) + calloc(:./dubious.c:82 (use tor_malloc, tor_free, etc) + noguard:./dubious.h (No #ifndef/#define header guard pair found) + dupguard:./same_guard.h (Guard macro GUARD_MACRO_H also used in ./good_guard.h) + dup fname:./subdir/dubious.c (same as ./dubious.c). diff --git a/scripts/maint/checkspace_tests/good_guard.h b/scripts/maint/checkspace_tests/good_guard.h new file mode 100644 index 000000000..b792912d9 --- /dev/null +++ b/scripts/maint/checkspace_tests/good_guard.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MACRO_H +#define GUARD_MACRO_H + +int bar(void); + +#endif diff --git a/scripts/maint/checkspace_tests/same_guard.h b/scripts/maint/checkspace_tests/same_guard.h new file mode 100644 index 000000000..b792912d9 --- /dev/null +++ b/scripts/maint/checkspace_tests/same_guard.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MACRO_H +#define GUARD_MACRO_H + +int bar(void); + +#endif diff --git a/scripts/maint/checkspace_tests/subdir/dubious.c b/scripts/maint/checkspace_tests/subdir/dubious.c new file mode 100644 index 000000000..7f22bf79b --- /dev/null +++ b/scripts/maint/checkspace_tests/subdir/dubious.c @@ -0,0 +1 @@ +// Nothing wrong with this file, but the name is a duplicate.

1 0

[tor/master] Merge branch 'pr-1569-squashed'
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit df6c5382ad0c3da45808bf67cec63f40942b561b Merge: a4c22164c 92a6803e1 Author: teor <teor(a)torproject.org> Date: Tue Dec 3 12:57:06 2019 +1000 Merge branch 'pr-1569-squashed' Makefile.am | 7 +++ scripts/maint/checkSpace.pl | 51 ++++++++------- scripts/maint/checkSpaceTest.sh | 36 +++++++++++ scripts/maint/checkspace_tests/dubious.c | 83 +++++++++++++++++++++++++ scripts/maint/checkspace_tests/dubious.h | 4 ++ scripts/maint/checkspace_tests/expected.txt | 31 +++++++++ scripts/maint/checkspace_tests/good_guard.h | 6 ++ scripts/maint/checkspace_tests/same_guard.h | 6 ++ scripts/maint/checkspace_tests/subdir/dubious.c | 1 + src/test/include.am | 5 ++ 10 files changed, 208 insertions(+), 22 deletions(-)

1 0

[tor/master] Have checkSpaceTest.sh exit as skipped when on Windows
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 8a10a7487006b24849999858d3d3a8db491859ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 2 12:43:10 2019 -0500 Have checkSpaceTest.sh exit as skipped when on Windows Managing line-ending issues for this one isn't worth it. --- scripts/maint/checkSpaceTest.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/maint/checkSpaceTest.sh b/scripts/maint/checkSpaceTest.sh index a1eea58eb..e1d207a1a 100755 --- a/scripts/maint/checkSpaceTest.sh +++ b/scripts/maint/checkSpaceTest.sh @@ -7,6 +7,19 @@ umask 077 set -e +# Skip this test if we're running on Windows; we expect line-ending +# issues in that case. +case "$(uname -s)" in + CYGWIN*) WINDOWS=1;; + MINGW*) WINDOWS=1;; + MSYS*) WINDOWS=1;; + *) WINDOWS=0;; +esac +if test "$WINDOWS" = 1; then + # This magic value tells automake that the test has been skipped. + exit 77 +fi + # make a safe space for temporary files DATA_DIR=$(mktemp -d -t tor_checkspace_tests.XXXXXX) trap 'rm -rf "$DATA_DIR"' 0

1 0

[tor/master] Distribute checkSpaceTest.sh and run it when we have perl.
by teor＠torproject.org 03 Dec '19

03 Dec '19

commit 92a6803e1d20244a98c205c46a4215a67259c7e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 2 12:43:10 2019 -0500 Distribute checkSpaceTest.sh and run it when we have perl. --- Makefile.am | 7 +++++++ src/test/include.am | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/Makefile.am b/Makefile.am index 38040a4e7..b01601ecc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,6 +168,13 @@ EXTRA_DIST+= \ ReleaseNotes \ scripts/maint/checkIncludes.py \ scripts/maint/checkSpace.pl \ + scripts/maint/checkSpaceTest.sh \ + scripts/maint/checkspace_tests/dubious.c \ + scripts/maint/checkspace_tests/dubious.h \ + scripts/maint/checkspace_tests/expected.txt \ + scripts/maint/checkspace_tests/good_guard.h \ + scripts/maint/checkspace_tests/same_guard.h \ + scripts/maint/checkspace_tests/subdir/dubious.c \ scripts/maint/checkShellScripts.sh \ scripts/maint/practracker/README \ scripts/maint/practracker/exceptions.txt \ diff --git a/src/test/include.am b/src/test/include.am index 6697dbb17..94352c864 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -48,6 +48,11 @@ TESTSCRIPTS += src/test/test_rebind.sh endif endif +if USE_PERL +TESTSCRIPTS += \ + scripts/maint/checkSpaceTest.sh +endif + TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ src/test/test_workqueue \ src/test/test_keygen.sh \

1 0