From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 Sep 2019 12:59:29 +0000 (-0400)
Subject: Merge branch 'ticket31578' into ticket31578_merged
X-Git-Tag: tor-0.4.2.1-alpha~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7565855c0105836857acf9c67363d1f6948e4ac;p=thirdparty%2Ftor.git

Merge branch 'ticket31578' into ticket31578_merged
---

e7565855c0105836857acf9c67363d1f6948e4ac
diff --cc scripts/maint/practracker/practracker.py
index 78003fb786,537f755c8b..ce9c5f5d82
--- a/scripts/maint/practracker/practracker.py
+++ b/scripts/maint/practracker/practracker.py
@@@ -218,11 -216,10 +221,11 @@@ def main(argv)
      filt.addThreshold(problem.FileSizeItem("*.h", int(args.max_h_file_size)))
      filt.addThreshold(problem.IncludeCountItem("*.h", int(args.max_h_include_count)))
      filt.addThreshold(problem.FunctionSizeItem("*.c", int(args.max_function_size)))
 -    filt.addThreshold(problem.DependencyViolationItem("*", int(args.max_dependency_violations)))
 +    filt.addThreshold(problem.DependencyViolationItem("*.c", int(args.max_dependency_violations)))
 +    filt.addThreshold(problem.DependencyViolationItem("*.h", int(args.max_dependency_violations)))
  
      # 1) Get all the .c files we care about
-     files_list = util.get_tor_c_files(TOR_TOPDIR)
+     files_list = util.get_tor_c_files(TOR_TOPDIR, args.include_dir)
  
      # 2) Initialize problem vault and load an optional exceptions file so that
      # we don't warn about the past
diff --cc scripts/maint/practracker/test_practracker.sh
index 4f8b7e2047,78e96ba471..bfbd0c6560
--- a/scripts/maint/practracker/test_practracker.sh
+++ b/scripts/maint/practracker/test_practracker.sh
@@@ -25,9 -25,8 +25,13 @@@ DATA="${PRACTRACKER_DIR}/testdata
  
  run_practracker() {
      "${PYTHON:-python}" "${PRACTRACKER_DIR}/practracker.py" \
-         --max-include-count=0 --max-file-size=0 \
-         --max-h-include-count=0 --max-h-file-size=0 \
-         --max-function-size=0 --terse \
+         --include-dir "" \
 -        --max-include-count=0 --max-file-size=0 --max-function-size=0 --terse \
++        --max-file-size=0 \
++        --max-function-size=0 \
++        --max-h-file-size=0 \
++        --max-h-include-count=0 \
++        --max-include-count=0 \
++        --terse \
          "${DATA}/" "$@";
  }
  compare() {