nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,185 Commits 53 Branches 630 Tags 128 MiB
0b2c64effd
Commit Graph

792 Commits

Author SHA1 Message Date
teor
eb55d85e75
practracker: Fail tests if any process exits unexpectedly 
Part of 32705.
 2020-01-15 22:29:44 +10:00
teor
cda2ff1965
practracker: Capture stderr output in test_practracker.sh 
And canonicalise file paths, so that output is consistent, even in
out-of-tree builds.

Capturing stderr output produces better diagnostics.

Diagnostics for 32705.
 2020-01-15 22:29:22 +10:00
teor
c80694decc
scripts/git: Improve branch list comments 
Hopefully, these explanations make it easier to get the next branch
transition right.

Part of 32772.
 2020-01-15 12:28:00 +10:00
teor
536eeb4589
scripts/git: Fix git-merge-forward after removing 0.2.9 
We need a test branch for the earliest maint branch (maint-0.3.5),
but we can't merge forward into it, because there is no previous
active maint branch.

Also, edit a git-push-all comment that still said "029".

Bugfix on 32772; bug not in any released version of tor.
 2020-01-15 12:22:38 +10:00
David Goulet
b958529dbf Merge branch 'tor-github/pr/1633' 2020-01-14 14:03:21 -05:00
teor
8095c785f1
Merge branch 'maint-0.4.2' 2020-01-14 17:41:44 +10:00
teor
7e111d0eaa
practracker: print a notice to stderr when disabled 
When TOR_DISABLE_PRACTRACKER is set, print a message to
stderr when skipping practracker checks.

Part of 32705.
 2020-01-14 17:41:00 +10:00
Nick Mathewson
6b1592b564 test_practracker.sh: never disable practracker 
When practracker is disabled, its output will be empty.  We don't
want that happening during our tests.

Fixes bug 32705; bugfix on 0.4.2.1-alpha, when test_practracker.sh
was introduced.
 2020-01-13 16:17:51 -05:00
Nick Mathewson
73ac1add3f Split core/include.am into per-subdirectory include.am files 
Closes ticket 32137.
 2020-01-13 09:34:17 -05:00
rl1987
c0dd214c8a Remove 0.2.9 from git scripts 2019-12-30 12:41:08 +07:00
teor
ac3a9aaf0d
Makefile/git scripts: Add comments to keep owned file lists in sync 2019-12-20 09:35:18 +10:00
teor
5c98a42f49
Merge remote-tracking branch 'tor-github/pr/1584' 2019-12-19 19:33:29 +10:00
teor
1619f14a04
python: Add __future__ imports for python 3 compatibility 
Except for src/ext, which we may not want to modify.

Closes ticket 32732.
 2019-12-12 15:58:51 +10:00
Nick Mathewson
e93801bfe6 Port changelog tools to python 3 
Closes ticket 32704.
 2019-12-09 10:53:48 -05:00
teor
9a556dee81
cocci: Require spatch >= 1.0.4 to run checks 
No changes file required: not in any released version of tor.

Fixes bug 32663.
 2019-12-05 10:27:47 +10:00
Nick Mathewson
fcb5656128 Merge branch 'ticket32609_squashed' 2019-12-04 12:15:28 -05:00
teor
b0f1b760ae practracker: document !advisory in includes.py 2019-12-04 12:15:22 -05:00
teor
8861ad85d0 git scripts: Add the checkSpace.pl unit tests 
Extra testing after 32613.
 2019-12-04 12:15:22 -05:00
teor
19324ff0ba practracker: Test for bad ".c" includes in the unit tests 
Part of 32522.
 2019-12-04 12:15:22 -05:00
teor
5ce45ac907 Makefile/git scripts: Add the practracker unit tests 
Add a check-practracker-unit-test target, and run it as part of
"make check".

Add the practracker unit tests to scripts/git/pre-commit.git-hook.

Part of 32609.
 2019-12-04 12:15:22 -05:00
Nick Mathewson
8a10a74870
Have checkSpaceTest.sh exit as skipped when on Windows 
Managing line-ending issues for this one isn't worth it.
 2019-12-03 12:56:50 +10:00
Nick Mathewson
bd61a4e848
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.
 2019-12-03 12:56:46 +10:00
Nick Mathewson
2aaa7ae6e2 checkSpace.pl: make output more uniform. 
There were lots of slight differences in indentation and formatting
among the in-file error messages.
 2019-11-26 12:58:25 -05:00
teor
fadd292bf0
practracker/includes.py: Don't read editor temp files 
(Or any files that start with "." or "#".)

Obviously correct changes to already-reviewed code.
 2019-11-26 17:52:18 +10:00
teor
0ce11433c0
check-spaces: Fix an outdated comment 2019-11-26 11:02:28 +10:00
teor
ab70c315bd
practracker: Fix a typo in a logging function call 
Obviously correct changes to already-reviewed code.
 2019-11-26 11:01:34 +10:00
Nick Mathewson
31f8b4fa65 Merge branch 'stream-socks-auth' into bug19859_merged 2019-11-25 07:58:02 -05:00
Nick Mathewson
d9d75d4ae1 rename_c_identifier: don't crash when doing only one replacement. 2019-11-23 15:30:18 -05:00
Nick Mathewson
5060007f4b Split log configuration out of options_act_reversible(). 2019-11-19 16:03:32 -05:00
George Kadianakis
53ac9a9a91 Add changes file for #30381. 2019-11-18 19:21:10 +02:00
David Goulet
1371d29e5b Merge branch 'tor-github/pr/1489' 2019-11-14 10:37:14 -05:00
teor
3b4a360ed0
practracker: Don't read editor temp files, attempt 2 
(Or any files that start with "." or "#".)

Obviously correct changes to already-reviewed code.
 2019-11-14 16:12:19 +10:00
teor
7ee1e16c6f
scripts/git: Stop failing when upstream branches don't exist 
If you add a custom remote, or a new branch, and don't fetch first,
then the script would fail when checking for unchanged branches.

Instead, skip the check: a new branch is definitely a change.
 2019-11-07 12:04:51 +10:00
teor
3864536b7c
scripts/git: Remove extra printfs from a bad merge 2019-11-07 12:04:22 +10:00
teor
e6b5a1ff93
shellcheck: Fix minor issues in some scripts 
Fix minor issues in git-push-all.sh, git-setup-dirs.sh and
test_parseconf.sh.

Fixes bug 32402; not in any released version of tor.
Obviously correct changes to already reviewed code.
 2019-11-06 16:21:01 +10:00
teor
f7b45975bf
Merge branch 'bug32402_042' into bug32402_master 
Merge changes from master with shellcheck fixes.
 2019-11-06 16:14:06 +10:00
teor
7f23d47f72
shellcheck: Fix issues in the git-*.sh scripts 
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
 2019-11-06 16:09:31 +10:00
teor
57baea701f
shellcheck: Start checking most scripts for errors 
This check was accidentally disabled by a bad find command.

Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
 2019-11-06 15:49:50 +10:00
teor
60d5ff303d
practracker: Preserve improvements 2019-11-05 14:28:02 +10:00
teor
6169469546
Merge remote-tracking branch 'tor-github/pr/1477' 2019-11-05 14:23:10 +10:00
teor
bcb38d984d practracker: Update the exceptions file with improvements 
Regenerate the exceptions file, but only commit the improvements.

Includes changes from 32213 and other tickets.
 2019-11-05 12:50:08 +10:00
teor
81972353cb scripts: Fix update_versions.py for out-of-tree builds 
Fixes bug 32371; bugfix on 0.4.0.1-alpha.
 2019-11-05 12:00:59 +10:00
teor
c065ad3e3d practracker: Rename functions modified by a previous commit 
Part of 32213.
 2019-11-05 11:36:26 +10:00
JeremyRand
736322ce61
Bug #19859: Increase function-size exception to 124 2019-11-03 07:11:08 +00:00
teor
1ffb3b549f
scripts/git: Add TOR_EXTRA_REMOTE_* for an extra git remote 
When running git-setup-dirs.sh.

Part of 32347.
 2019-10-31 14:59:19 +10:00
teor
38e8cca6a1
scripts/git: Add TOR_EXTRA_CLONE_ARGS for git clone 
When running git-setup-dirs.sh.

Part of 32347.
 2019-10-31 14:59:16 +10:00
teor
995618ec61
scripts/git: Make a master symlink in the worktree directory 
When running git-setup-dirs.sh.

Part of 32347.
 2019-10-31 14:59:12 +10:00
teor
e046903f93
scripts/git: Restore a dropped check for pre-commit in pre-push 
Bugfix on 31919; not in any released version of Tor.
 2019-10-31 14:51:31 +10:00
teor
7e73c0d5a1
scripts/git: Print the correct path in git-setup-dirs.sh 2019-10-31 14:39:49 +10:00
teor
cb7340abf1
scripts/git: Don't use spaces in git URLs 2019-10-31 13:56:59 +10:00
teor
3479024cb1 scripts: Change to the top source directory as needed 
Bugfix on 31919; not in any released version of tor.
 2019-10-28 13:28:50 +10:00
teor
18e09913bf
practracker: Don't read editor temp files 
(Or any dot files.)

Obviously correct changes to already-reviewed code.
 2019-10-28 13:09:58 +10:00
teor
68befa3b84
scripts/git: Fix a shellcheck error in pre-commit.git-hook 
Some versions of shellcheck do not detect this error.

Bugfix on 31919; not in any released version of tor.
 2019-10-28 13:04:29 +10:00
Nick Mathewson
e7993dc046 Merge branch 'ticket31241_v3' 2019-10-25 08:10:39 -04:00
teor
00c3fba61c
scripts/maint: Stop assuming that python3 is in /usr/bin 
Obviously correct fix to rename_c_identifier.py.

Bugfix on 32237; not in any released version of tor.
 2019-10-25 16:46:54 +10:00
teor
f40eb2ead6
Merge remote-tracking branch 'tor-github/pr/1462' 2019-10-25 16:14:37 +10:00
Nick Mathewson
dc6d7f072d Make foo_validate() functions call config_validate(). 
The former foo_validate() functions are now toplevel
legacy_validate_fn callbacks.  The new foo_validate() functions now
call them.

This change lets us remove the old shared_random disk state
validation callback entirely.
 2019-10-24 20:30:32 -04:00
teor
b3d035d5c4
Merge remote-tracking branch 'tor-github/pr/1463' 2019-10-25 10:27:41 +10:00
Nick Mathewson
fcdb66acd3 Add a script to rename C identifiers, and optionally add a commit message 
This script should "pay for itself" if it prevents one bug caused by
careless search-replace-commit loops.
 2019-10-24 08:20:31 -04:00
teor
1094389d82
scripts/git: Make spaces consistent in pre-push.git-hook 
Part of 31919.
 2019-10-24 14:10:30 +10:00
teor
b4b316631d
scripts/git: Only check modified files in existing git hook checks 
Part of 31919.
 2019-10-24 14:10:26 +10:00
teor
b9a2286765
scripts/git: Add check_cocci_parse.sh to the pre-commit hook 
But only check modified files, which dramatically speeds up
check_cocci_parse.sh.

Part of 31919.
 2019-10-24 14:09:53 +10:00
teor
71b8b7ee2d
scripts/cocci: Check owned src in check_cocci_parse.sh by default 
Check the tor-owned sources in an 0.3.5 directory layout, if no
files are provided on the command line.

Part of 31919.
 2019-10-24 14:09:45 +10:00
teor
330717f018
scripts/cocci: Add check_cocci_parse.sh and default exceptions 
Add check_cocci_parse.sh, which is a thin wrapper around
try_parse.sh. Add a default exceptions file, and use it in
check_cocci_parse.sh.

Part of 31919.
 2019-10-24 11:40:58 +10:00
teor
87ee49e016
scripts/cocci: Remove unused arguments from try_parse.sh spatch 
Part of 31919.
 2019-10-24 11:40:54 +10:00
teor
9a96068a0b
scripts/cocci: Add an exceptions file to try_parse.sh 
Set $TOR_COCCI_EXCEPTIONS_FILE to the name of an exceptions file,
containing a list of filename patterns matched by 'grep -f'.

Part of 31919.
 2019-10-24 11:40:51 +10:00
teor
20606b8a15
Merge remote-tracking branch 'tor-github/pr/1447' 2019-10-24 10:00:47 +10:00
teor
f43a7a4d96
scripts/git: Avoid sleeping before the last push in git-push-all.sh 
Change the loop order, so that we only sleep between pushes,
and avoid sleeping after all the pushes are done.

(In rare cases, there may still be an extra sleep.)

Part of 32216.
 2019-10-23 13:28:37 +10:00
teor
4f6f006c99
scripts/git: Make git-push-all.sh skip more branches that match upstream 
The script now skips master, maint-* and release-* branches that match
upstream, not just test branches.

And fix "no branches" bugs that this change makes happen more often.

Part of 32216.
 2019-10-23 13:28:15 +10:00
teor
9a3b768fae
scripts/git: Pass all unrecognised arguments to git-push-all.sh 
This makes the behaviour of git-push-all.sh -n identical to the other
git scripts.

Part of 32216.
 2019-10-23 13:04:28 +10:00
teor
71191fa3dc
scripts/git: Fix a variable name typo in git-push-all.sh 
Obviously correct changes to already reviewed code.
 2019-10-23 13:01:55 +10:00
Nick Mathewson
b2d487ae22 Merge branch 'ticket31705_v2' into ticket31705_v2_merged 
Conflicts:
	src/feature/dirparse/authcert_parse.c
	src/feature/dirparse/ns_parse.c
	src/feature/hs/hs_service.c
	src/lib/conf/conftesting.h
	src/lib/log/log.h
	src/lib/thread/threads.h
	src/test/test_options.c

These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
 2019-10-22 09:39:06 -04:00
Nick Mathewson
3e41459dff confmacros.h: fix coccinelle parsing. 2019-10-22 09:32:13 -04:00
Nick Mathewson
d6ce8527f8 tor-coccinelle.h: add a definition for EXTERN 2019-10-22 09:32:13 -04:00
Nick Mathewson
6696a5bbae tor-coccinelle.h: add HANDLE_{DECL,IMPL} 2019-10-22 09:32:13 -04:00
Nick Mathewson
d129b503c0 tor-coccinelle.h: add EAT_SEMICOLON 2019-10-22 09:32:13 -04:00
Nick Mathewson
2e64dfea95 tor-coccinelle.h: add CHECK_SCANF 2019-10-22 09:32:13 -04:00
Nick Mathewson
7798c53c98 tor-coccinelle.h: add MOCK_DECL 2019-10-22 09:24:25 -04:00
Nick Mathewson
18f1624bbe tor-coccinelle.h: handle SLIST and LIST. 2019-10-22 09:24:25 -04:00
Nick Mathewson
a2bb66c355 Add a "COCCI" macro that we tell coccinelle is always defined. 
This will let us give specific in-file equivalents to given macros
or preprocessor directives, to make things parse.
 2019-10-22 09:24:25 -04:00
Nick Mathewson
ea47e53252 tor-coccinelle.h: handle NS and NS_DECL. 2019-10-22 09:24:25 -04:00
Nick Mathewson
017c62000c tor-coccinelle: handle SIMPLEQ and TAILQ better. 2019-10-22 09:24:25 -04:00
Nick Mathewson
c13c0c8999 tor-coccinelle.h: Add {EN,DIS}ABLE_GCC_WARNING. 2019-10-22 09:24:25 -04:00
Nick Mathewson
eb1260e346 tor-coccinelle: expect parentheses after HT_INITIALIZER 2019-10-22 09:24:25 -04:00
Nick Mathewson
51c2097586 try_parse.sh: add a verbose mode and a meaningful exit code. 2019-10-22 09:24:25 -04:00
Nick Mathewson
9ab96550da document test-operator-cleanup 2019-10-22 09:24:25 -04:00
Nick Mathewson
b4e1dc747e Merge remote-tracking branch 'tor-github/pr/1420' 2019-10-21 18:45:34 -04:00
Nick Mathewson
264c5312eb Merge branch 'maint-0.4.2' 2019-10-18 12:32:49 -04:00
Alexander Færøy
95e3527df0 Bump practracker exception limit for process_win32_exec(). 
I have added a larger comment there and one line of code, so I think
this bump is reasonable.

See: https://bugs.torproject.org/31810
 2019-10-17 21:12:51 +02:00
teor
85d0a458c2
scripts: Add git-setup-dirs.sh, which sets up maintainer git repos 
git-setup-dirs.sh sets up an upstream git repository and worktrees,
so that tor maintainers can do merges.

Closes ticket 29603.
 2019-10-17 14:47:48 +10:00
teor
e6bb23434e Merge remote-tracking branch 'tor-github/pr/1419' 
Obviously correct fixes to code that's already been reviewed.
 2019-10-17 13:47:42 +10:00
Nick Mathewson
2c97cf3add Merge remote-tracking branch 'tor-github/pr/1329' 2019-10-16 12:31:47 -04:00
Nick Mathewson
08fd551e9f Regenerate practracker exceptions file for 0.4.3 progress. 2019-10-16 09:15:00 -04:00
Nick Mathewson
8ce17e0b35 practracker: add a missing #. 2019-10-16 09:15:00 -04:00
teor
11b5946e49 scripts: Fix a git script comment 2019-10-15 13:58:53 +10:00
teor
028987a0a1 scripts: Merge forward test branch _042 into test branch _master 
Fixes an issue where test branch _041 was merged into _042 and _master.
This issue only affects test branch mode (-t).
 2019-10-15 13:36:56 +10:00
Nick Mathewson
78f4e29219 git scripts: add maint/release-0.4.2. 2019-10-11 17:26:34 -04:00
Nick Mathewson
a4790e7d4b maint-0.4.2: remove ".enable_practracker_in_hooks". 2019-10-11 17:18:55 -04:00
Nick Mathewson
4ab85f4928 Document tor-coccinelle.h 2019-10-09 09:23:49 -04:00
Nick Mathewson
5fd137c482 Merge remote-tracking branch 'tor-github/pr/1358' 2019-10-03 09:11:49 -04:00