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

[tor/maint-0.4.1] Merge branch 'tor-github/pr/1271' into maint-0.4.1
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 630bb113a0825b4d4ef8a9447b4ff2557a571a1e Merge: e3a458e44 664d1b436 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 4 08:33:10 2019 -0400 Merge branch 'tor-github/pr/1271' into maint-0.4.1 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] test: Change "make test-stem" so it only runs the stem tests that use tor
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 664d1b436651aca81579a06cde8437ae8f15484f Author: teor <teor(a)torproject.org> Date: Thu Aug 29 21:56:16 2019 +1000 test: Change "make test-stem" so it only runs the stem tests that use tor This change makes test-stem faster and more reliable. Use "make test-stem-full" to run all of stem's tests. Closes ticket 31554. --- Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b268180c5..5d18666ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,7 +275,7 @@ need-stem-path: fi test-stem: need-stem-path $(TESTING_TOR_BINARY) - @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --log notice --target RUN_ALL; + @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --test control.controller --test control.base_controller --test process --log notice; test-stem-full: need-stem-path $(TESTING_TOR_BINARY) @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v; diff --git a/changes/ticket31554 b/changes/ticket31554 new file mode 100644 index 000000000..73f4159ff --- /dev/null +++ b/changes/ticket31554 @@ -0,0 +1,4 @@ + o Minor features (stem tests): + - Change "make test-stem" so it only runs the stem tests that use tor. + This change makes test-stem faster and more reliable. + Closes ticket 31554.

1 0

[tor/master] Merge branch 'tor-github/pr/1271' into maint-0.4.1
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 630bb113a0825b4d4ef8a9447b4ff2557a571a1e Merge: e3a458e44 664d1b436 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 4 08:33:10 2019 -0400 Merge branch 'tor-github/pr/1271' into maint-0.4.1 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit a816742f3736adf29cb49253c1b8f3ba6af1eca2 Merge: 6210c7507 630bb113a Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 4 08:33:28 2019 -0400 Merge branch 'maint-0.4.1' Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] test: Change "make test-stem" so it only runs the stem tests that use tor
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 664d1b436651aca81579a06cde8437ae8f15484f Author: teor <teor(a)torproject.org> Date: Thu Aug 29 21:56:16 2019 +1000 test: Change "make test-stem" so it only runs the stem tests that use tor This change makes test-stem faster and more reliable. Use "make test-stem-full" to run all of stem's tests. Closes ticket 31554. --- Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b268180c5..5d18666ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,7 +275,7 @@ need-stem-path: fi test-stem: need-stem-path $(TESTING_TOR_BINARY) - @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --log notice --target RUN_ALL; + @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --test control.controller --test control.base_controller --test process --log notice; test-stem-full: need-stem-path $(TESTING_TOR_BINARY) @$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v; diff --git a/changes/ticket31554 b/changes/ticket31554 new file mode 100644 index 000000000..73f4159ff --- /dev/null +++ b/changes/ticket31554 @@ -0,0 +1,4 @@ + o Minor features (stem tests): + - Change "make test-stem" so it only runs the stem tests that use tor. + This change makes test-stem faster and more reliable. + Closes ticket 31554.

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 51103450e4a997aa5a31cf9d60b3b22355525bd5 Merge: d6f3e2251 630bb113a Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 4 08:33:27 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Merge branch 'tor-github/pr/1271' into maint-0.4.1
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 630bb113a0825b4d4ef8a9447b4ff2557a571a1e Merge: e3a458e44 664d1b436 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 4 08:33:10 2019 -0400 Merge branch 'tor-github/pr/1271' into maint-0.4.1 Makefile.am | 2 +- changes/ticket31554 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'tor-github/pr/1246'
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 6210c750762541273ef39831b146462bebcb2740 Merge: 7fa624537 e3f7e5e65 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 4 08:27:36 2019 -0400 Merge branch 'tor-github/pr/1246' Makefile.am | 1 + scripts/maint/practracker/README | 21 +++++++++++++++++++++ scripts/maint/practracker/includes.py | 2 +- scripts/maint/practracker/practracker.py | 19 ++++++++++++------- 4 files changed, 35 insertions(+), 8 deletions(-)

1 0

[tor/master] Document new practracker violation types, and add a practracker readme
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 5b3741e05ac82cbe99942cffdc5662bd53c783dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 10:00:05 2019 -0400 Document new practracker violation types, and add a practracker readme Closes ticket 31476. --- Makefile.am | 1 + scripts/maint/practracker/README | 21 +++++++++++++++++++++ scripts/maint/practracker/practracker.py | 11 ++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index d3cce3934..0800497dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,6 +168,7 @@ EXTRA_DIST+= \ ReleaseNotes \ scripts/maint/checkIncludes.py \ scripts/maint/checkSpace.pl \ + scripts/maint/practracker/README \ scripts/maint/practracker/exceptions.txt \ scripts/maint/practracker/includes.py \ scripts/maint/practracker/metrics.py \ diff --git a/scripts/maint/practracker/README b/scripts/maint/practracker/README new file mode 100644 index 000000000..d2ad8220c --- /dev/null +++ b/scripts/maint/practracker/README @@ -0,0 +1,21 @@ +Practracker is a simple python tool that keeps track of places where +our code is ugly, and tries to warn us about new ones or ones that +get worse. + +Right now, practracker looks for the following kinds of +best-practices violations: + + C files greater than 3000 lines long + H files greater than 500 lines long + C files with more than 50 includes + H files with more than 15 includes + + All files that include a local header not listed in a .may_include + file in the same directory, when that .may_include file has an + "!advisory" marker. + +The list of current violations is tracked in exceptions.txt; slight +deviations of the current exceptions cause warnings, whereas large +ones cause practracker to fail. + +For usage information, run "practracker.py --help". diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 6483b88da..73e4cb3e8 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -7,7 +7,8 @@ Go through the various .c files and collect metrics about them. If the metrics violate some of our best practices and they are not found in the optional exceptions file, then log a problem about them. -We currently do metrics about file size, function size and number of includes. +We currently do metrics about file size, function size and number of includes, +for C files and headers. practracker.py should be run with its second argument pointing to the Tor top-level source directory like this: @@ -143,8 +144,12 @@ HEADER="""\ # # There are three kinds of problems that we recognize right now: # function-size -- a function of more than {MAX_FUNCTION_SIZE} lines. -# file-size -- a file of more than {MAX_FILE_SIZE} lines. -# include-count -- a file with more than {MAX_INCLUDE_COUNT} #includes. +# file-size -- a C file of more than {MAX_FILE_SIZE} lines, or an H +# file with more than {MAX_H_FILE_SIZE} lines. +# include-count -- a C file with more than {MAX_INCLUDE_COUNT} #includes, + or an H file with more than {MAX_H_INCLUDE_COUNT} #includes. +# dependency-violation -- a file includes a header that it should +# not, according to an advisory .may_include file. # # Each line below represents a single exception that practracker should # _ignore_. Each line has four parts:

1 0

[tor/master] practracker: make filename terminology uniform
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit e3f7e5e65ed29a4a6e210ab50a731bba6e85f31c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 29 09:20:27 2019 -0400 practracker: make filename terminology uniform Previously we often referred to "C files" and "H files", which is more ambiguous than ".c files" and ".h files". --- scripts/maint/practracker/README | 8 ++++---- scripts/maint/practracker/includes.py | 2 +- scripts/maint/practracker/practracker.py | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/maint/practracker/README b/scripts/maint/practracker/README index d2ad8220c..d978b3980 100644 --- a/scripts/maint/practracker/README +++ b/scripts/maint/practracker/README @@ -5,10 +5,10 @@ get worse. Right now, practracker looks for the following kinds of best-practices violations: - C files greater than 3000 lines long - H files greater than 500 lines long - C files with more than 50 includes - H files with more than 15 includes + .c files greater than 3000 lines long + .h files greater than 500 lines long + .c files with more than 50 includes + .h files with more than 15 includes All files that include a local header not listed in a .may_include file in the same directory, when that .may_include file has an diff --git a/scripts/maint/practracker/includes.py b/scripts/maint/practracker/includes.py index fcc527c98..397439b4e 100755 --- a/scripts/maint/practracker/includes.py +++ b/scripts/maint/practracker/includes.py @@ -212,7 +212,7 @@ def consider_include_rules(fname, f): log_sorted_levels = False def walk_c_files(topdir="src"): - """Run through all c and h files under topdir, looking for + """Run through all .c and .h files under topdir, looking for include-rule violations. Yield those violations.""" for dirpath, dirnames, fnames in os.walk(topdir): diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 73e4cb3e8..b477cd60c 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -8,7 +8,7 @@ violate some of our best practices and they are not found in the optional exceptions file, then log a problem about them. We currently do metrics about file size, function size and number of includes, -for C files and headers. +for C source files and headers. practracker.py should be run with its second argument pointing to the Tor top-level source directory like this: @@ -144,10 +144,10 @@ HEADER="""\ # # There are three kinds of problems that we recognize right now: # function-size -- a function of more than {MAX_FUNCTION_SIZE} lines. -# file-size -- a C file of more than {MAX_FILE_SIZE} lines, or an H +# file-size -- a .c file of more than {MAX_FILE_SIZE} lines, or a .h # file with more than {MAX_H_FILE_SIZE} lines. -# include-count -- a C file with more than {MAX_INCLUDE_COUNT} #includes, - or an H file with more than {MAX_H_INCLUDE_COUNT} #includes. +# include-count -- a .c file with more than {MAX_INCLUDE_COUNT} #includes, + or a .h file with more than {MAX_H_INCLUDE_COUNT} #includes. # dependency-violation -- a file includes a header that it should # not, according to an advisory .may_include file. # @@ -189,13 +189,13 @@ def main(argv): parser.add_argument("--terse", action="store_true", help="Do not emit helpful instructions.") parser.add_argument("--max-h-file-size", default=MAX_H_FILE_SIZE, - help="Maximum lines per .H file") + help="Maximum lines per .h file") parser.add_argument("--max-h-include-count", default=MAX_H_INCLUDE_COUNT, - help="Maximum includes per .H file") + help="Maximum includes per .h file") parser.add_argument("--max-file-size", default=MAX_FILE_SIZE, - help="Maximum lines per C file") + help="Maximum lines per .c file") parser.add_argument("--max-include-count", default=MAX_INCLUDE_COUNT, - help="Maximum includes per C file") + help="Maximum includes per .c file") parser.add_argument("--max-function-size", default=MAX_FUNCTION_SIZE, help="Maximum lines per function") parser.add_argument("--max-dependency-violations", default=MAX_DEP_VIOLATIONS,

1 0