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
7e7a4874b8
test_addr.c: use COCCI to suppress macros coccinelle cannot parse.
2019-10-22 09:32:13 -04:00
0da349aa5e
test.h: Use COCCI to suppress macros Coccinelle does not understand.
2019-10-22 09:32:13 -04:00
0b862a7616
threads.h: coccinelle cannot understand a macro.
2019-10-22 09:32:13 -04:00
4346e5569e
ctassert.h: fix CTASSERT_DECL so coccinelle can parse it.
2019-10-22 09:32:13 -04:00
189375fb5d
ratelim.h: use COCCI to hide an initializer.
2019-10-22 09:32:13 -04:00
c77f57d37b
util_bug.h: Coccinelle does not understand IF_BUG_ONCE or #nodef.
2019-10-22 09:32:13 -04:00
fb4b6b6436
weakrng.h: use COCCI to hide a macro coccinelle cannot parse.
2019-10-22 09:32:13 -04:00
d1cdb1a24e
Use STMT_BEGIN/END in parse_int.c so coccinelle can handle it.
2019-10-22 09:32:13 -04:00
41f44d8760
smartlist.h: use COCCI to hide SMARTLIST_FOREACH_JOIN from Coccinelle
2019-10-22 09:32:13 -04:00
514c61e406
namemap_st.h: Use COCCI to hide an initializer.
2019-10-22 09:32:13 -04:00
2695f7e68c
timeval.h: Coccinelle cannot understand timercmp.
2019-10-22 09:32:13 -04:00
9f50a92a7e
Fix a macro in address.c so coccinelle can understand it
2019-10-22 09:32:13 -04:00
0abe89519b
timers.c: define TIMEOUT_PUBLIC to no tokens when using COCCI.
2019-10-22 09:32:13 -04:00
9453746b5e
dispatch_naming.c: when COCCI is defined, disable unparseable macros.
2019-10-22 09:32:13 -04:00
04a74d4aa7
conftesting.h: when COCCI is defined, disable unhandled macros
2019-10-22 09:32:13 -04:00
3e41459dff
confmacros.h: fix coccinelle parsing.
2019-10-22 09:32:13 -04:00
54c5366aa1
feature/control: wrap some problem macros in COCCI
2019-10-22 09:32:13 -04:00
d6ce8527f8
tor-coccinelle.h: add a definition for EXTERN
2019-10-22 09:32:13 -04:00
ef5d1e6b65
consdiff disable a macro when running with COCCI
2019-10-22 09:32:13 -04:00
d9bad0203b
Disable a couple of iterator macros when COCCI is defined.
2019-10-22 09:32:13 -04:00
67247fa9ac
Use various COCCI tests to get mainloop.c to parse.
2019-10-22 09:32:13 -04:00
4fad456148
test: Hide some test-declaration macro definitions to COCCI.
...
(These ones cause parsing failures.)
2019-10-22 09:32:13 -04:00
6696a5bbae
tor-coccinelle.h: add HANDLE_{DECL,IMPL}
2019-10-22 09:32:13 -04:00
d129b503c0
tor-coccinelle.h: add EAT_SEMICOLON
2019-10-22 09:32:13 -04:00
c1e8e5bb32
Apparently coccinelle can't handle multiline #errors.
2019-10-22 09:32:13 -04:00
b03c8c74ce
COCCI: Disable some buffers.c macros that coccinelle can't handle.
2019-10-22 09:32:13 -04:00
2e64dfea95
tor-coccinelle.h: add CHECK_SCANF
2019-10-22 09:32:13 -04:00
b867e97ce6
With COCCI defined, avoid PERIODIC_EVENT.
...
Coccinelle doesn't understand the particular pattern of token
pasting we have going on here.
2019-10-22 09:32:05 -04:00
48be922160
COCCI: disable DOWLOAD_SCHEDULE macro
2019-10-22 09:31:31 -04:00
7798c53c98
tor-coccinelle.h: add MOCK_DECL
2019-10-22 09:24:25 -04:00
18f1624bbe
tor-coccinelle.h: handle SLIST and LIST.
2019-10-22 09:24:25 -04:00
630d8c7a1a
With coccinelle, avoid includes in the middle of an expression.
2019-10-22 09:24:25 -04:00
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
ea47e53252
tor-coccinelle.h: handle NS and NS_DECL.
2019-10-22 09:24:25 -04:00
017c62000c
tor-coccinelle: handle SIMPLEQ and TAILQ better.
2019-10-22 09:24:25 -04:00
c13c0c8999
tor-coccinelle.h: Add {EN,DIS}ABLE_GCC_WARNING.
2019-10-22 09:24:25 -04:00
eb1260e346
tor-coccinelle: expect parentheses after HT_INITIALIZER
2019-10-22 09:24:25 -04:00
9871fcbcd9
Use #warning instead of #warn: one is C and one isn't.
2019-10-22 09:24:25 -04:00
51c2097586
try_parse.sh: add a verbose mode and a meaningful exit code.
2019-10-22 09:24:25 -04:00
9ab96550da
document test-operator-cleanup
2019-10-22 09:24:25 -04:00
2d013bbe5c
Merge remote-tracking branch 'tor-github/pr/1417'
2019-10-22 08:36:32 -04:00
a1d5341374
Merge branch 'bug32175'
2019-10-22 07:51:30 -04:00
65e80ce646
Merge branch 'from_setconf_removal_squashed'
2019-10-22 07:50:42 -04:00
0bb2e77283
changes file for 31999
2019-10-22 07:50:13 -04:00
6d15fab2dc
Extract log-granularity code into its own function.
...
This pleases practracker.
2019-10-22 07:50:13 -04:00
9ac2c71cbd
Add tests for options_init_logs()
2019-10-22 07:50:13 -04:00
f4fc633937
Make a pair of add_*_log() functions mockable.
2019-10-22 07:50:13 -04:00
ac3136a6fb
Make options_init_logs STATIC for testing.
2019-10-22 07:50:13 -04:00
98c3b3bb4c
Update tests to handle new interpretation of quiet_level.
...
Two things needed to be changed. First, we used to set quiet_level
to the default (QUIET_NONE) when running tests, since we would not
call anything that acted based upon it. But since we sometimes call
options_init_logs(), we need to pre-set quiet_level to QUIET_SILENT
in the logs so that we don't add the default logs. This did not
cause test failure: just unwanted logs.
Second, we had a test that checked whether options_validate was
messing with options->Logs correctly. Since options_validate no
longer messes with the logs, we no longer want a test for this.
2019-10-22 07:50:13 -04:00
Nick Mathewson