Merge branch 'ticket31578' into ticket31578_merged

diff --cc scripts/maint/practracker/practracker.py
index 78003fb7862cd2f1d2de635b0ce0d80210617583,537f755c8bb811295213805a571a901f333915da..ce9c5f5d820439c8c1982e8d96243dda8a753c48
--- 1/scripts/maint/practracker/practracker.py
--- 2/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 4f8b7e2047dd8c10f913823dd1a92e8c83957d0d,78e96ba4719659f0f49970c5b315903ce1389ddf..bfbd0c656014ee585ddf05588fe38ae158f4b407
--- 1/scripts/maint/practracker/test_practracker.sh
--- 2/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() {