[clang-tools-extra] 89a1d03 - [clang-tidy] Organize test files into subdirectories by module (NFC)

[via cfe-commits]

Author: Richard
Date: 2022-06-22T12:13:34-06:00
New Revision: 89a1d03e2b379e325daa5249411e414bbd995b5e

URL: https://github.com/llvm/llvm-project/commit/89a1d03e2b379e325daa5249411e414bbd995b5e
DIFF: https://github.com/llvm/llvm-project/commit/89a1d03e2b379e325daa5249411e414bbd995b5e.diff

LOG: [clang-tidy] Organize test files into subdirectories by module (NFC)

Eliminate clutter by reorganizing the Lit test files for clang-tidy:
- Move checkers/<module>-* to checkers/<module>/*.
- Move module specific inputs from Inputs to <module>/Inputs.  Remove
  any module prefix from the file or subdirectory name as they are no
  longer needed.
- Introduce a Lit substitution %clang_tidy_headers for the system
  headers in checkers/Inputs/Headers and use this throughout.  This
  avoids referencing system headers through a relative path to the
  parent directory and makes it clear that these fake system headers are
  shared among all modules.
- Update add_new_check.py to follow the above conventions when creating
  the boiler plate test files for a new check.
- Update Contributing.rst to describe per-module Inputs directory and
  fix link to test source code.

Differential Revision: https://reviews.llvm.org/D128072

Added: 
    clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/external-file.h
    clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/flags/internal-file.h
    clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/strings/internal-file.h
    clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/time/time.h
    clang-tools-extra/test/clang-tidy/checkers/abseil/cleanup-ctad.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/duration-addition.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/duration-comparison.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/duration-conversion-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/duration-division.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-float.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-scale.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/duration-subtraction.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/duration-unnecessary-conversion.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/faster-strsplit-delimiter.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/no-internal-dependencies.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/no-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/str-cat-append.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/time-comparison.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/time-subtraction.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil/upgrade-duration-conversions.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/Verilog.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/kernel.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/kernel.h
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/other_Verilog.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/otherdir/vhdl.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/otherthing.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/dir/kernel.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/kernel.cl/foo.h
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/verilog.cl/foo.h
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/vhdl.cl/foo.h
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some_kernel.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/somedir/verilog.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/thing.h
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/KERNEL.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/VHDL.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/vERILOG.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/verilog.h
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl.CL
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl.h
    clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl_number_two.cl
    clang-tools-extra/test/clang-tidy/checkers/altera/id-dependent-backward-branch.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera/kernel-name-restriction.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera/single-work-item-barrier.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align-invalid-decl-no-crash.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align-no-crash.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera/unroll-loops.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-accept.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-accept4.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-creat.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-dup.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-epoll-create.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-epoll-create1.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-fopen.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-inotify-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-inotify-init1.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-memfd-create.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-open.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-pipe.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-pipe2.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/cloexec-socket.cpp
    clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry-custom-macro.c
    clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry.c
    clang-tools-extra/test/clang-tidy/checkers/boost/use-to-string.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/argument-comment/header-with-decl.h
    clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/argument-comment/system-header-with-decl.h
    clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/not-null-terminated-result/not-null-terminated-result-c.h
    clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/not-null-terminated-result/not-null-terminated-result-cxx.h
    clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/reserved-identifier/system/system-header.h
    clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/reserved-identifier/user-header.h
    clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/unchecked-optional-access/absl/types/optional.h
    clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-gmock.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-ignore-single-argument.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-literals.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.m
    clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread-sigterm-not-a-literal.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread-undef-sigterm.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/bool-pointer-implicit-conversion.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone-if-constexpr-template.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone-macro-crash.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/copy-constructor-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/dynamic-static-initializers.hpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore-default.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicit-qualifiers.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len2.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len3.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-qualifiermixing.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape-openmp.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/fold-init-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/forward-declaration-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/forwarding-reference-overload.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-array-subscript-expression.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-char.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-extint.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-int.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-pointer-offset.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-short.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/inaccurate-erase.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/incorrect-roundings.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop.mm
    clang-tools-extra/test/clang-tidy/checkers/bugprone/integer-division.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-parentheses-cmdline.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-parentheses.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-repeated-side-effects.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-operator-in-strlen-in-alloc.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-operator-in-strlen-in-alloc.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-pointer-arithmetic-in-alloc.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-pointer-arithmetic-in-alloc.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-explicit-only.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-implicit-enabled.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/move-forwarding-reference.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/multiple-statement-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/no-escape.m
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-other.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-stdc-want-lib-ext1-not-a-literal.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-undef-stdc-want-lib-ext1.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wmemcpy-safe-cxx.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/parent-virtual-call.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/posix-return.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/redundant-branch-condition.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-c.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/shared-ptr-array-mismatch.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-fsigned-char.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-funsigned-char.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-with-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-container.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/spuriously-wake-up-functions.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/spuriously-wake-up-functions.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/string-constructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/string-integer-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/string-literal-with-embedded-nul.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/stringview-nullptr.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage-strict.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison-32bits.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memset-usage.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memset-usage.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-missing-comma.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon-constexpr.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon-fail.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/swapped-arguments.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/terminating-continue.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/throw-keyword-missing.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable-magniute-bits-upper-limit.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/undefined-memory-manipulation.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/undelegated-constructor-cxx98.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/undelegated-constructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-exception-at-new.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-raii-crash.mm
    clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-raii.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-custom.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/use-after-move.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone/virtual-near-miss.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/dcl21-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/dcl58-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/env33-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert/err33-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert/err34-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert/err34-c.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/flp30-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert/limited-randomness.c
    clang-tools-extra/test/clang-tidy/checkers/cert/limited-randomness.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/mem57-cpp-cpp17.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/mem57-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/msc32-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert/msc51-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/oop11-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/oop54-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/oop57-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/oop58-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/setlongjmp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/static-object-exception.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/str34-c.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/throw-exception-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert/variadic-function-def.cpp
    clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-any.cpp
    clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-glibc.cpp
    clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-posix.cpp
    clang-tools-extra/test/clang-tidy/checkers/concurrency/thread-canceltype-asynchronous.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-goto.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-non-const-global-variables.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/init-variables-conflict.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/init-variables.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/interfaces-global-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-caps-only.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-command-line-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-custom.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-bitfields.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-equivalentbitwidth-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-ignoreconversionfromtypes-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-intemplates-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-long-is-32bits.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingfloatingpoint-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowinginteger-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingintegertofloatingpoint-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-pedanticmode-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-unsigned-char.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-custom.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-no-functions.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-containers.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-legacy-functions.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-array-to-pointer-decay.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-c++03.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-gslheader.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-pointer-arithmetic-pr36489.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-pointer-arithmetic.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-const-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-cstyle-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-cxx98.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-delayed.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-no-crash.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.ignorearrays.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-reinterpret-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-static-cast-downcast.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-union-access.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-vararg-ms.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-vararg.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/slicing.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-allow-missing-move-when-copy-is-deleted.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-cxx-03.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-relaxed.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/virtual-class-destructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/darwin/avoid-spinlock.m
    clang-tools-extra/test/clang-tidy/checkers/darwin/dispatch-once-nonstatic.mm
    clang-tools-extra/test/clang-tidy/checkers/fuchsia/default-arguments-calls.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia/default-arguments-declarations.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia/multiple-inheritance.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia/overloaded-operator.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia/statically-constructed-objects.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia/trailing-return.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia/virtual-inheritance.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/Inputs/google-namespaces.h
    clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/gtest-typed-test.h
    clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/gtest.h
    clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
    clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/nosuite/gtest/gtest.h
    clang-tools-extra/test/clang-tidy/checkers/google/build-explicit-make-pair.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/default-arguments.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/explicit-constructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/module.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/namespaces.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/objc-avoid-nsobject-new.m
    clang-tools-extra/test/clang-tidy/checkers/google/objc-avoid-throwing-exception.m
    clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m
    clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.mm
    clang-tools-extra/test/clang-tidy/checkers/google/objc-global-variable-declaration.m
    clang-tools-extra/test/clang-tidy/checkers/google/objc-global-variable-declaration.mm
    clang-tools-extra/test/clang-tidy/checkers/google/overloaded-unary-and.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.c
    clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.mm
    clang-tools-extra/test/clang-tidy/checkers/google/readability-namespace-comments-c++17.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/readability-namespace-comments.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/readability-todo.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/runtime-int-std.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.c
    clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.cpp
    clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.m
    clang-tools-extra/test/clang-tidy/checkers/google/upgrade-googletest-case.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/exception-baseclass.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered-else.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/no-assembler-msvc.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/no-assembler.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-bug34747.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-integer-literals.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-standard-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-standard-types.h
    clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise.cpp
    clang-tools-extra/test/clang-tidy/checkers/linuxkernel/must-check-errs.c
    clang-tools-extra/test/clang-tidy/checkers/llvm/include-order.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-isa-or-dyn-cast-in-conditionals.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned2.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned3.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm/qualified-auto.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm/twine-local.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/resource/include/stdatomic.h
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/resource/include/stddef.h
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdio.h
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdlib.h
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/string.h
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc/callee-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc/implementation-in-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc/restrict-system-libc-headers.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/Inputs/unused-using-decls.h
    clang-tools-extra/test/clang-tidy/checkers/misc/confusable-identifiers.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/definitions-in-headers-1z.hpp
    clang-tools-extra/test/clang-tidy/checkers/misc/definitions-in-headers.hpp
    clang-tools-extra/test/clang-tidy/checkers/misc/misleading-bidirectional.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/misleading-identifier.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const.c
    clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/new-delete-overloads-sized-dealloc.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/new-delete-overloads.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/no-recursion.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/non-copyable-objects.c
    clang-tools-extra/test/clang-tidy/checkers/misc/non-copyable-objects.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/non-private-member-variables-in-classes.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/redundant-expression.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/static-assert.c
    clang-tools-extra/test/clang-tidy/checkers/misc/static-assert.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/throw-by-value-catch-by-reference.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator-precxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/uniqueptr-reset-release.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unused-alias-decls.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unused-invalid-parameter.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters.c
    clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls-errors.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/concat-nested-namespaces/modernize-concat-nested-namespaces.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/assert.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/complex.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/ctype.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/errno.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/fenv.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/float.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/inttypes.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/iso646.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/limits.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/locale.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/math.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/mylib.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/mysystemlib.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/setjmp.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/signal.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdalign.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdarg.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdbool.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stddef.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdint.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdio.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdlib.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/string.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/tgmath.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/time.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/uchar.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/wchar.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/wctype.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum2.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum3.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/pass-by-value/header-with-fix.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/pass-by-value/header.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/replace-auto-ptr/memory.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/initializer_list.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/shared_ptr.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/unique_ptr.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/use-auto/containers.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/use-using/modernize-use-using.h
    clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind-permissive-parameter-list.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays-ignores-main.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays-ignores-three-arg-main.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-cxx03.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-cxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-ios-base-aliases.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-assert-failure.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-const.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-extra.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-multidimensional.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-negative.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-reverse.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-rewritten-binop.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert.c
    clang-tools-extra/test/clang-tidy/checkers/modernize/macro-to-enum.c
    clang-tools-extra/test/clang-tidy/checkers/modernize/macro-to-enum.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-cxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-inaccessible-ctors.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-macro-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-multi-fixes.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-delimiter.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-replace-shorter.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg-delayed.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.c
    clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/replace-auto-ptr.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/replace-disallow-copy-and-assign-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/replace-random-shuffle.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/return-braced-init-list.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/shrink-to-fit.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/unary-static-assert.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-iterator.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new-remove-stars.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals-ignore-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-bitfield.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-delayed.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-clang-unused.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-cxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-gcc-unused.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro-inscope-cxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-error.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-opt.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr-basic.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.c
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-allow-override-and-final.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-cxx98.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-ms.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-no-destructors.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-no-macro-inscope.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-transparent-functors.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-uncaught-exceptions.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-using-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp
    clang-tools-extra/test/clang-tidy/checkers/mpi/Inputs/type-mismatch/mpimock.h
    clang-tools-extra/test/clang-tidy/checkers/mpi/buffer-deref.cpp
    clang-tools-extra/test/clang-tidy/checkers/mpi/type-mismatch.cpp
    clang-tools-extra/test/clang-tidy/checkers/objc/Inputs/assert/XCTestAssertions.h
    clang-tools-extra/test/clang-tidy/checkers/objc/assert-equals.m
    clang-tools-extra/test/clang-tidy/checkers/objc/avoid-nserror-init.m
    clang-tools-extra/test/clang-tidy/checkers/objc/dealloc-in-category.m
    clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing-custom.m
    clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing.m
    clang-tools-extra/test/clang-tidy/checkers/objc/missing-hash.m
    clang-tools-extra/test/clang-tidy/checkers/objc/nsinvocation-argument-lifetime.m
    clang-tools-extra/test/clang-tidy/checkers/objc/property-declaration.m
    clang-tools-extra/test/clang-tidy/checkers/objc/super-self.m
    clang-tools-extra/test/clang-tidy/checkers/openmp/exception-escape.cpp
    clang-tools-extra/test/clang-tidy/checkers/openmp/use-default-none.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/Inputs/unnecessary-value-param/header-fixed.h
    clang-tools-extra/test/clang-tidy/checkers/performance/Inputs/unnecessary-value-param/header.h
    clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-allowed-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-warn-on-all-auto-copies.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/implicit-conversion-in-loop.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-algorithm.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-string-concatenation.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-vector-operation.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-const-ref.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-trivially-copyable.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/no-automatic-move.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/no-int-to-ptr.c
    clang-tools-extra/test/clang-tidy/checkers/performance/no-int-to-ptr.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/noexcept-move-constructor-fix.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/noexcept-move-constructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/type-promotion-in-math-fn.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-allowed-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-excluded-container-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-allowed-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-arc.m
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-arc.mm
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-delayed.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-incomplete-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/float.h
    clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/r.h
    clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/s.h
    clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/stddef.h
    clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/stdint.h
    clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/t.h
    clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/transitive.h
    clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/transitive2.h
    clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-allow.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-disallow.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-glob.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-transitive.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-ppc.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-x86.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability/std-allocator-const.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/duplicate-include.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/duplicate-include2.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/iostream
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/string.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/sys/types.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/types.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/.clang-tidy
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/header.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/.clang-tidy
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/header.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation1/.clang-tidy
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/system/coroutines.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/system/system-header.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/user-header.h
    clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/static-accessed-through-instance/__clang_cuda_builtin_vars.h
    clang-tools-extra/test/clang-tidy/checkers/readability/avoid-const-params-in-decls.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/avoid-underscore-in-googletest-name.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-assert-failure.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-attributes.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-constexpr-if-templates.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-few-lines.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-format.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-same-line.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-single-line.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/container-contains.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/delete-null-pointer.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/duplicate-include.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-if-constexpr.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-cond-var-refactor.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-warn.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-pp-no-crash.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity-flags.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/function-size-variables-c++17.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/function-size.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-length.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix-name-conflicts.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-case-violation.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-ignored-regexp.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-main-like.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-member-decl-usage.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-multiple-styles.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-objc.m
    clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-allow-in-conditions.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-cxx98.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-strict.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-fixing.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-no-infinite-loop.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration.c
    clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-bitfields.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-todo.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-userliteral.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/make-member-function-const.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/misleading-indentation.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/misplaced-array-index.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/named-parameter.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/non-const-parameter.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/qualified-auto-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/qualified-auto.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers-check-first-declaration.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-control-flow.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration-ignore-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.c
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-function-ptr-dereference.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-member-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor-ifdef.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor.h
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-msvc.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-msvc.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init-msvc.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-case.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-chained-conditional-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-chained-conditional-return.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-demorgan.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-members.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/simplify-subscript-expr.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance-nesting-threshold.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/static-definition-in-anonymous-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/string-compare.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/suspicious-call-argument.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uniqueptr-delete-release.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-float16.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-floating-point-opencl-half.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-floating-point.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-hexadecimal-floating-point.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-ms.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix.h
    clang-tools-extra/test/clang-tidy/checkers/readability/use-anyofallof-cpp20.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability/use-anyofallof.cpp
    clang-tools-extra/test/clang-tidy/checkers/zircon/temporary-objects.cpp

Modified: 
    clang-tools-extra/clang-tidy/add_new_check.py
    clang-tools-extra/docs/clang-tidy/Contributing.rst
    clang-tools-extra/test/lit.cfg.py

Removed: 
    clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/external-file.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/flags/internal-file.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/strings/internal-file.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/time/time.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/types/optional.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/Verilog.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/kernel.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/kernel.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/other_Verilog.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/otherdir/vhdl.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/otherthing.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/dir/kernel.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/kernel.cl/foo.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/verilog.cl/foo.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/vhdl.cl/foo.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some_kernel.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/somedir/verilog.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/thing.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/KERNEL.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/VHDL.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/vERILOG.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/verilog.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl.CL
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl_number_two.cl
    clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-argument-comment/header-with-decl.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-argument-comment/system-header-with-decl.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-c.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-cxx.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-reserved-identifier/system/system-header.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-reserved-identifier/user-header.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/google-namespaces.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest-typed-test.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/resource/include/stdatomic.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/resource/include/stddef.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/stdio.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/stdlib.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/string.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-concat-nested-namespaces/modernize-concat-nested-namespaces.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/assert.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/complex.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/ctype.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/errno.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/fenv.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/float.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/inttypes.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/iso646.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/limits.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/locale.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/math.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/mylib.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/mysystemlib.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/setjmp.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/signal.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdalign.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdarg.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdbool.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stddef.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdint.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdio.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdlib.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/string.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/tgmath.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/time.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/uchar.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wchar.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wctype.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-loop-convert/structures.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum2.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum3.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header-with-fix.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-replace-auto-ptr/memory.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/initializer_list.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/shared_ptr.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/unique_ptr.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-auto/containers.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-using/modernize-use-using.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/mpi-type-mismatch/mpimock.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/objc-assert/XCTestAssertions.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header-fixed.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/float.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/r.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/s.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/stddef.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/stdint.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/t.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/transitive.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/transitive2.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include2.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/iostream
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/string.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/sys/types.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/types.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style1/.clang-tidy
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style1/header.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style2/.clang-tidy
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style2/header.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/hungarian-notation1/.clang-tidy
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/hungarian-notation2/.clang-tidy
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/coroutines.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/system-header.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/user-header.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-static-accessed-through-instance/__clang_cuda_builtin_vars.h
    clang-tools-extra/test/clang-tidy/checkers/Inputs/unused-using-decls.h
    clang-tools-extra/test/clang-tidy/checkers/abseil-cleanup-ctad.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-duration-addition.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-duration-comparison.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-duration-conversion-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-duration-division.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-float.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-scale.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-duration-subtraction.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-duration-unnecessary-conversion.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-faster-strsplit-delimiter.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-no-internal-dependencies.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-no-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-redundant-strcat-calls.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-str-cat-append.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-startswith.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-str-contains.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-time-comparison.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-time-subtraction.cpp
    clang-tools-extra/test/clang-tidy/checkers/abseil-upgrade-duration-conversions.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera-id-dependent-backward-branch.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera-kernel-name-restriction.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera-single-work-item-barrier.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align-invalid-decl-no-crash.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align-no-crash.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align.cpp
    clang-tools-extra/test/clang-tidy/checkers/altera-unroll-loops.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept4.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-creat.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-dup.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create1.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-fopen.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init1.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-memfd-create.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-open.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe2.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-cloexec-socket.cpp
    clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry-custom-macro.c
    clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry.c
    clang-tools-extra/test/clang-tidy/checkers/boost-use-to-string.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-gmock.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-ignore-single-argument.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-literals.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-strict.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.m
    clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread-sigterm-not-a-literal.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread-undef-sigterm.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-bool-pointer-implicit-conversion.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-if-constexpr-template.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-macro-crash.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-copy-constructor-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-dangling-handle.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-dynamic-static-initializers.hpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-ignore-default.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-ignore.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicit-qualifiers.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicits.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicits.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-len2.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-len3.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-prefixsuffixname.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-qualifiermixing.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-relatedness.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-relatedness.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape-openmp.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-fold-init-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-forward-declaration-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-forwarding-reference-overload.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-array-subscript-expression.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-char.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-extint.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-int.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-pointer-offset.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-short.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-inaccurate-erase.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-incorrect-roundings.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.mm
    clang-tools-extra/test/clang-tidy/checkers/bugprone-integer-division.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-lambda-function-name.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses-cmdline.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-repeated-side-effects.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-pointer-arithmetic-in-alloc.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-pointer-arithmetic-in-alloc.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-explicit-only.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-implicit-enabled.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-move-forwarding-reference.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-multiple-statement-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-no-escape.m
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-in-initialization-strlen.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-before-safe.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-other.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-stdc-want-lib-ext1-not-a-literal.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-strlen.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-undef-stdc-want-lib-ext1.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wcslen.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-parent-virtual-call.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-posix-return.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-redundant-branch-condition.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier-c.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier-invert.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-shared-ptr-array-mismatch.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-minimal.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-posix.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-fsigned-char.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-funsigned-char.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-with-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-container.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-expression.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-spuriously-wake-up-functions.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-spuriously-wake-up-functions.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-string-constructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-string-integer-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-string-literal-with-embedded-nul.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-stringview-nullptr.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage-strict.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-include.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison-32bits.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-missing-comma.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-constexpr.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-fail.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.c
    clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-swapped-arguments.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-terminating-continue.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-throw-keyword-missing.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-unchecked-optional-access.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-undefined-memory-manipulation.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor-cxx98.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-exception-at-new.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii-crash.mm
    clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value-custom.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-use-after-move.cpp
    clang-tools-extra/test/clang-tidy/checkers/bugprone-virtual-near-miss.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-dcl21-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-env33-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert-err33-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-flp30-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.c
    clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-mem57-cpp-cpp17.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-mem57-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-msc32-c.c
    clang-tools-extra/test/clang-tidy/checkers/cert-msc51-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-oop11-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-oop54-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-oop57-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-oop58-cpp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-setlongjmp.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-static-object-exception.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-str34-c.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-throw-exception-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp
    clang-tools-extra/test/clang-tidy/checkers/cert-variadic-function-def.cpp
    clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-any.cpp
    clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-glibc.cpp
    clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-posix.cpp
    clang-tools-extra/test/clang-tidy/checkers/concurrency-thread-canceltype-asynchronous.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-goto.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-non-const-global-variables.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables-conflict.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-interfaces-global-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-caps-only.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-command-line-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-custom.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-bitfields.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-equivalentbitwidth-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-ignoreconversionfromtypes-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-intemplates-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowinginteger-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingintegertofloatingpoint-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-custom.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-no-functions.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-containers.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-legacy-functions.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer-modernize-use-default-member-init-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer-modernize-use-default-member-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-const-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-cstyle-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx98.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-delayed.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-no-crash.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-use-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.ignorearrays.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-reinterpret-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-static-cast-downcast.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-union-access.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg-ms.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-slicing.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-allow-missing-move-when-copy-is-deleted.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-cxx-03.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-relaxed.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions.cpp
    clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-virtual-class-destructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/darwin-avoid-spinlock.m
    clang-tools-extra/test/clang-tidy/checkers/darwin-dispatch-once-nonstatic.mm
    clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-calls.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-declarations.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia-multiple-inheritance.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia-overloaded-operator.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia-statically-constructed-objects.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia-trailing-return.cpp
    clang-tools-extra/test/clang-tidy/checkers/fuchsia-virtual-inheritance.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-build-explicit-make-pair.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-default-arguments.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-explicit-constructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-module.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-namespaces.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-nsobject-new.m
    clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-throwing-exception.m
    clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.m
    clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.mm
    clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.m
    clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.mm
    clang-tools-extra/test/clang-tidy/checkers/google-overloaded-unary-and.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.c
    clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.mm
    clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments-c++17.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-readability-todo.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-runtime-int-std.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.c
    clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.cpp
    clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.m
    clang-tools-extra/test/clang-tidy/checkers/google-upgrade-googletest-case.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-exception-baseclass.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered-else.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler-msvc.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-bug34747.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-integer-literals.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.h
    clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise.cpp
    clang-tools-extra/test/clang-tidy/checkers/linuxkernel-must-check-errs.c
    clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned2.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned3.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm-qualified-auto.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvm-twine-local.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc-callee-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc-implementation-in-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/llvmlibc-restrict-system-libc-headers.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-confusable-identifiers.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers-1z.hpp
    clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers.hpp
    clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.c
    clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads-sized-dealloc.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-no-recursion.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.c
    clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-non-private-member-variables-in-classes.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.c
    clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-throw-by-value-catch-by-reference.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-precxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-uniqueptr-reset-release.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unused-alias-decls.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unused-invalid-parameter.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters-strict.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.c
    clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-errors.cpp
    clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind-permissive-parameter-list.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-main.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-three-arg-main.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-concat-nested-namespaces.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx03.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-extern-c.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-ios-base-aliases.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-assert-failure.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-basic.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-camelback.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-const.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-extra.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-lowercase.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-multidimensional.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-negative.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-reverse.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-rewritten-binop.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-uppercase.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert.c
    clang-tools-extra/test/clang-tidy/checkers/modernize-macro-to-enum.c
    clang-tools-extra/test/clang-tidy/checkers/modernize-macro-to-enum.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-cxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-default-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-inaccessible-ctors.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-macro-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-multi-fixes.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-delimiter.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-replace-shorter.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg-delayed.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.c
    clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-replace-auto-ptr.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-replace-disallow-copy-and-assign-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-replace-random-shuffle.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-return-braced-init-list.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-shrink-to-fit.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-unary-static-assert.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast-remove-stars.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-iterator.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-min-type-name-length.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new-remove-stars.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals-ignore-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-bitfield.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace-ignore-implicit-constructors.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-copy.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-delayed.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-clang-unused.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-cxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-gcc-unused.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-error.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-opt.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-basic.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.c
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-allow-override-and-final.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-cxx98.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-ms.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-no-destructors.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-no-macro-inscope.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-override.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-transparent-functors.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-uncaught-exceptions.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-using-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
    clang-tools-extra/test/clang-tidy/checkers/mpi-buffer-deref.cpp
    clang-tools-extra/test/clang-tidy/checkers/mpi-type-mismatch.cpp
    clang-tools-extra/test/clang-tidy/checkers/objc-assert-equals.m
    clang-tools-extra/test/clang-tidy/checkers/objc-avoid-nserror-init.m
    clang-tools-extra/test/clang-tidy/checkers/objc-dealloc-in-category.m
    clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing-custom.m
    clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing.m
    clang-tools-extra/test/clang-tidy/checkers/objc-missing-hash.m
    clang-tools-extra/test/clang-tidy/checkers/objc-nsinvocation-argument-lifetime.m
    clang-tools-extra/test/clang-tidy/checkers/objc-property-declaration.m
    clang-tools-extra/test/clang-tidy/checkers/objc-super-self.m
    clang-tools-extra/test/clang-tidy/checkers/openmp-exception-escape.cpp
    clang-tools-extra/test/clang-tidy/checkers/openmp-use-default-none.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-faster-string-find.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-allowed-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-warn-on-all-auto-copies.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-implicit-conversion-in-loop.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-algorithm.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-string-concatenation.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-const-ref.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-trivially-copyable.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-move-constructor-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-no-automatic-move.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-no-int-to-ptr.c
    clang-tools-extra/test/clang-tidy/checkers/performance-no-int-to-ptr.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor-fix.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-trivially-destructible.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-type-promotion-in-math-fn.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-allowed-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-excluded-container-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-allowed-types.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.m
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.mm
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-delayed.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-header.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-incomplete-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-allow.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-disallow.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-glob.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-transitive.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-ppc.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-x86.cpp
    clang-tools-extra/test/clang-tidy/checkers/portability-std-allocator-const.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-avoid-const-params-in-decls.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-avoid-underscore-in-googletest-name.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-assert-failure.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-attributes.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-constexpr-if-templates.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-few-lines.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-format.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-same-line.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-single-line.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-container-contains.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-container-data-pointer.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-convert-member-functions-to-static.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-delete-null-pointer.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-duplicate-include.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-if-constexpr.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-no-cond-var-refactor.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-no-warn.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-pp-no-crash.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity-flags.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-function-size-variables-c++17.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-function-size.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-length.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix-name-conflicts.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-case-violation.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-hungarian-notation-cfgfile.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-hungarian-notation.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-ignored-regexp.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-main-like.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-member-decl-usage.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-multiple-styles.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-objc.m
    clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-allow-in-conditions.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-cxx98.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-strict.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-fixing.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-no-infinite-loop.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.c
    clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-bitfields.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-todo.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-userliteral.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-make-member-function-const.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-misleading-indentation.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-misplaced-array-index.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-named-parameter.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-non-const-parameter.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-qualified-auto-cxx20.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-qualified-auto.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers-check-first-declaration.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-control-flow.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration-ignore-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.c
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-function-ptr-dereference.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-member-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor-ifdef.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.h
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-macros.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-msvc.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr-msvc.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-case.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-assignment.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-return.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-cxx17.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-demorgan.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-members.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-simplify-subscript-expr.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance-nesting-threshold.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-static-definition-in-anonymous-namespace.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-string-compare.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-suspicious-call-argument.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uniqueptr-delete-release.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-float16.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-custom-list.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-macro.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-ms.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix.h
    clang-tools-extra/test/clang-tidy/checkers/readability-use-anyofallof-cpp20.cpp
    clang-tools-extra/test/clang-tidy/checkers/readability-use-anyofallof.cpp
    clang-tools-extra/test/clang-tidy/checkers/zircon-temporary-objects.cpp


################################################################################
diff  --git a/clang-tools-extra/clang-tidy/add_new_check.py b/clang-tools-extra/clang-tidy/add_new_check.py
index 8631bf89bd257..19b6896e508fb 100644
--- a/clang-tools-extra/clang-tidy/add_new_check.py
+++ b/clang-tools-extra/clang-tidy/add_new_check.py
@@ -278,8 +278,9 @@ def add_release_notes(module_path, module, check_name):
 # Adds a test for the check.
 def write_test(module_path, module, check_name, test_extension):
   check_name_dashes = module + '-' + check_name
-  filename = os.path.normpath(os.path.join(module_path, '../../test/clang-tidy/checkers',
-                                           check_name_dashes + '.' + test_extension))
+  filename = os.path.normpath(os.path.join(
+    module_path, '..', '..', 'test', 'clang-tidy', 'checkers',
+    module, check_name + '.' + test_extension))
   print('Creating %s...' % filename)
   with io.open(filename, 'w', encoding='utf8', newline='\n') as f:
     f.write("""// RUN: %%check_clang_tidy %%s %(check_name_dashes)s %%t

diff  --git a/clang-tools-extra/docs/clang-tidy/Contributing.rst b/clang-tools-extra/docs/clang-tidy/Contributing.rst
index 5849353591cc2..e67de656f90da 100644
--- a/clang-tools-extra/docs/clang-tidy/Contributing.rst
+++ b/clang-tools-extra/docs/clang-tidy/Contributing.rst
@@ -582,7 +582,7 @@ to incorrect parts of the input. Use ``[[@LINE+X]]``/``[[@LINE-X]]``
 substitutions and distinct function and variable names in the test code.
 
 Here's an example of a test using the ``check_clang_tidy.py`` script (the full
-source code is at `test/clang-tidy/google-readability-casting.cpp`_):
+source code is at `test/clang-tidy/checkers/google/readability-casting.cpp`_):
 
 .. code-block:: c++
 
@@ -632,12 +632,18 @@ most frequent pitfalls are macros and templates:
    expansions/instantiations.
 
 If you need multiple files to exercise all the aspects of your check, it is
-recommended you place them in a subdirectory named for the check under ``Inputs``.
-This keeps the test directory from getting cluttered.
+recommended you place them in a subdirectory named for the check under the ``Inputs``
+directory for the module containing your check.  This keeps the test directory from
+getting cluttered.
+
+If you need to validate how your check interacts with system header files, a set
+of simulated system header files is located in the ``checkers/Inputs/Headers``
+directory.  The path to this directory is available in a lit test with the variable
+``%clang_tidy_headers``.
 
 .. _lit: https://llvm.org/docs/CommandGuide/lit.html
 .. _FileCheck: https://llvm.org/docs/CommandGuide/FileCheck.html
-.. _test/clang-tidy/google-readability-casting.cpp: https://reviews.llvm.org/
diff usion/L/browse/clang-tools-extra/trunk/test/clang-tidy/google-readability-casting.cpp
+.. _test/clang-tidy/checkers/google/readability-casting.cpp: https://github.com/llvm/llvm-project/blob/main/clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.cpp
 
 Out-of-tree check plugins
 -------------------------

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/external-file.h b/clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/external-file.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/external-file.h
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/external-file.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/flags/internal-file.h b/clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/flags/internal-file.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/flags/internal-file.h
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/flags/internal-file.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/strings/internal-file.h b/clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/strings/internal-file.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/strings/internal-file.h
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/strings/internal-file.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/time/time.h b/clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/time/time.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/time/time.h
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/Inputs/absl/time/time.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-cleanup-ctad.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/cleanup-ctad.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-cleanup-ctad.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/cleanup-ctad.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-addition.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-addition.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-duration-addition.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/duration-addition.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-comparison.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-comparison.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-duration-comparison.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/duration-comparison.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-conversion-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-conversion-cast.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-duration-conversion-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/duration-conversion-cast.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-division.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-division.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-duration-division.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/duration-division.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-float.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-float.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-float.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-float.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-scale.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-scale.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-duration-factory-scale.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/duration-factory-scale.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-subtraction.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-subtraction.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-duration-subtraction.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/duration-subtraction.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-duration-unnecessary-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/duration-unnecessary-conversion.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-duration-unnecessary-conversion.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/duration-unnecessary-conversion.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-faster-strsplit-delimiter.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/faster-strsplit-delimiter.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-faster-strsplit-delimiter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/faster-strsplit-delimiter.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-no-internal-dependencies.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/no-internal-dependencies.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-no-internal-dependencies.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/no-internal-dependencies.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-no-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/no-namespace.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-no-namespace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/no-namespace.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-redundant-strcat-calls.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-redundant-strcat-calls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/redundant-strcat-calls.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-str-cat-append.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/str-cat-append.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-str-cat-append.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/str-cat-append.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-startswith.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-startswith.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-str-contains.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-string-find-str-contains.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-time-comparison.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/time-comparison.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-time-comparison.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/time-comparison.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-time-subtraction.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/time-subtraction.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-time-subtraction.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/time-subtraction.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/abseil-upgrade-duration-conversions.cpp b/clang-tools-extra/test/clang-tidy/checkers/abseil/upgrade-duration-conversions.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/abseil-upgrade-duration-conversions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/abseil/upgrade-duration-conversions.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/Verilog.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/Verilog.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/Verilog.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/Verilog.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/kernel.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/kernel.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/kernel.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/kernel.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/kernel.h b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/kernel.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/kernel.h
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/kernel.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/other_Verilog.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/other_Verilog.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/other_Verilog.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/other_Verilog.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/otherdir/vhdl.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/otherdir/vhdl.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/otherdir/vhdl.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/otherdir/vhdl.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/otherthing.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/otherthing.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/otherthing.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/otherthing.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/dir/kernel.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/dir/kernel.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/dir/kernel.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/dir/kernel.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/kernel.cl/foo.h b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/kernel.cl/foo.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/kernel.cl/foo.h
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/kernel.cl/foo.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/verilog.cl/foo.h b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/verilog.cl/foo.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/verilog.cl/foo.h
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/verilog.cl/foo.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/vhdl.cl/foo.h b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/vhdl.cl/foo.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some/vhdl.cl/foo.h
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some/vhdl.cl/foo.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some_kernel.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some_kernel.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/some_kernel.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/some_kernel.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/somedir/verilog.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/somedir/verilog.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/somedir/verilog.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/somedir/verilog.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/thing.h b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/thing.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/thing.h
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/thing.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/KERNEL.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/KERNEL.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/KERNEL.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/KERNEL.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/VHDL.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/VHDL.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/VHDL.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/VHDL.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/vERILOG.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/vERILOG.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/uppercase/vERILOG.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/uppercase/vERILOG.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/verilog.h b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/verilog.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/verilog.h
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/verilog.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl.CL b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl.CL
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl.CL
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl.CL

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl.h b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl.h
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl_number_two.cl b/clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl_number_two.cl
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/altera-kernel-name-restriction/vhdl_number_two.cl
rename to clang-tools-extra/test/clang-tidy/checkers/altera/Inputs/kernel-name-restriction/vhdl_number_two.cl

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/altera-id-dependent-backward-branch.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/id-dependent-backward-branch.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/altera-id-dependent-backward-branch.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/altera/id-dependent-backward-branch.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/altera-kernel-name-restriction.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/kernel-name-restriction.cpp
similarity index 96%
rename from clang-tools-extra/test/clang-tidy/checkers/altera-kernel-name-restriction.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/altera/kernel-name-restriction.cpp
index 3d67751d1d4d6..fcf930f313f70 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/altera-kernel-name-restriction.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/altera/kernel-name-restriction.cpp
@@ -1,5 +1,5 @@
-// RUN: %check_clang_tidy %s altera-kernel-name-restriction %t -- -- -I%S/Inputs/altera-kernel-name-restriction
-// RUN: %check_clang_tidy -check-suffix=UPPERCASE %s altera-kernel-name-restriction %t -- -- -I%S/Inputs/altera-kernel-name-restriction/uppercase -DUPPERCASE
+// RUN: %check_clang_tidy %s altera-kernel-name-restriction %t -- -- -I%S/Inputs/kernel-name-restriction
+// RUN: %check_clang_tidy -check-suffix=UPPERCASE %s altera-kernel-name-restriction %t -- -- -I%S/Inputs/kernel-name-restriction/uppercase -DUPPERCASE
 
 #ifdef UPPERCASE
 // The warning should be triggered regardless of capitalization

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/altera-single-work-item-barrier.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/single-work-item-barrier.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/altera-single-work-item-barrier.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/altera/single-work-item-barrier.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align-invalid-decl-no-crash.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align-invalid-decl-no-crash.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align-invalid-decl-no-crash.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align-invalid-decl-no-crash.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align-no-crash.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align-no-crash.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align-no-crash.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align-no-crash.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/altera-struct-pack-align.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/altera/struct-pack-align.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/altera-unroll-loops.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera/unroll-loops.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/altera-unroll-loops.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/altera/unroll-loops.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-accept.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-accept.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept4.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-accept4.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-accept4.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-accept4.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-creat.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-creat.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-creat.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-creat.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-dup.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-dup.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-dup.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-dup.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-epoll-create.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-epoll-create.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create1.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-epoll-create1.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-epoll-create1.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-epoll-create1.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-fopen.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-fopen.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-fopen.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-fopen.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-inotify-init.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-inotify-init.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init1.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-inotify-init1.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-inotify-init1.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-inotify-init1.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-memfd-create.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-memfd-create.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-memfd-create.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-memfd-create.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-open.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-open.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-open.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-open.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-pipe.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-pipe.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe2.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-pipe2.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-pipe2.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-pipe2.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-cloexec-socket.cpp b/clang-tools-extra/test/clang-tidy/checkers/android/cloexec-socket.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-cloexec-socket.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/android/cloexec-socket.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry-custom-macro.c b/clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry-custom-macro.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry-custom-macro.c
rename to clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry-custom-macro.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry.c b/clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/android-comparison-in-temp-failure-retry.c
rename to clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/boost-use-to-string.cpp b/clang-tools-extra/test/clang-tidy/checkers/boost/use-to-string.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/boost-use-to-string.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/boost/use-to-string.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-argument-comment/header-with-decl.h b/clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/argument-comment/header-with-decl.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-argument-comment/header-with-decl.h
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/argument-comment/header-with-decl.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-argument-comment/system-header-with-decl.h b/clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/argument-comment/system-header-with-decl.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-argument-comment/system-header-with-decl.h
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/argument-comment/system-header-with-decl.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-c.h b/clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/not-null-terminated-result/not-null-terminated-result-c.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-c.h
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/not-null-terminated-result/not-null-terminated-result-c.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-cxx.h b/clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/not-null-terminated-result/not-null-terminated-result-cxx.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-cxx.h
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/not-null-terminated-result/not-null-terminated-result-cxx.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-reserved-identifier/system/system-header.h b/clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/reserved-identifier/system/system-header.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-reserved-identifier/system/system-header.h
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/reserved-identifier/system/system-header.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-reserved-identifier/user-header.h b/clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/reserved-identifier/user-header.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-reserved-identifier/user-header.h
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/reserved-identifier/user-header.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/types/optional.h b/clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/unchecked-optional-access/absl/types/optional.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/absl/types/optional.h
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/Inputs/unchecked-optional-access/absl/types/optional.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-gmock.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-gmock.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-gmock.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-gmock.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-ignore-single-argument.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-ignore-single-argument.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-ignore-single-argument.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-ignore-single-argument.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-literals.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-literals.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-literals.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment-strict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp
index 22dcd74b5c4fd..3b977ad681adf 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-argument-comment %t -- -- -I %S/Inputs/bugprone-argument-comment
+// RUN: %check_clang_tidy %s bugprone-argument-comment %t -- -- -I %S/Inputs/argument-comment
 
 // FIXME: clang-tidy should provide a -verify mode to make writing these checks
 // easier and more accurate.

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.m b/clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.m
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread-sigterm-not-a-literal.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread-sigterm-not-a-literal.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread-sigterm-not-a-literal.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread-sigterm-not-a-literal.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread-undef-sigterm.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread-undef-sigterm.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread-undef-sigterm.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread-undef-sigterm.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/bad-signal-to-kill-thread.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-bool-pointer-implicit-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/bool-pointer-implicit-conversion.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-bool-pointer-implicit-conversion.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/bool-pointer-implicit-conversion.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-if-constexpr-template.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone-if-constexpr-template.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-if-constexpr-template.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone-if-constexpr-template.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-macro-crash.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone-macro-crash.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone-macro-crash.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone-macro-crash.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/branch-clone.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-copy-constructor-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/copy-constructor-init.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-copy-constructor-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/copy-constructor-init.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-dangling-handle.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-dangling-handle.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-dynamic-static-initializers.hpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/dynamic-static-initializers.hpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-dynamic-static-initializers.hpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/dynamic-static-initializers.hpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-ignore-default.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore-default.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-ignore-default.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore-default.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-ignore.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-ignore.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicit-qualifiers.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicit-qualifiers.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicit-qualifiers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicit-qualifiers.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicits.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicits.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicits.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-implicits.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-len2.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len2.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-len2.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len2.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-len3.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len3.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-len3.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len3.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-prefixsuffixname.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-prefixsuffixname.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-qualifiermixing.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-qualifiermixing.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-qualifiermixing.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-qualifiermixing.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-relatedness.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-relatedness.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-relatedness.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters-relatedness.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-easily-swappable-parameters.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape-openmp.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape-openmp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape-openmp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape-openmp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-exception-escape.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-fold-init-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/fold-init-type.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-fold-init-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/fold-init-type.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-forward-declaration-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/forward-declaration-namespace.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-forward-declaration-namespace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/forward-declaration-namespace.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-forwarding-reference-overload.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/forwarding-reference-overload.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-forwarding-reference-overload.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/forwarding-reference-overload.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-array-subscript-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-array-subscript-expression.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-array-subscript-expression.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-array-subscript-expression.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-char.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-char.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-char.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-char.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-extint.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-extint.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-extint.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-extint.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-int.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-int.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-int.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-int.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-pointer-offset.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-pointer-offset.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-pointer-offset.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-pointer-offset.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-short.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-short.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-implicit-widening-of-multiplication-result-short.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-short.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-inaccurate-erase.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/inaccurate-erase.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-inaccurate-erase.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/inaccurate-erase.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-incorrect-roundings.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/incorrect-roundings.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-incorrect-roundings.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/incorrect-roundings.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.mm b/clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop.mm
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.mm
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop.mm

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-integer-division.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/integer-division.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-integer-division.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/integer-division.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-lambda-function-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-lambda-function-name.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses-cmdline.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-parentheses-cmdline.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses-cmdline.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-parentheses-cmdline.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-parentheses.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-parentheses.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-repeated-side-effects.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-repeated-side-effects.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-repeated-side-effects.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/macro-repeated-side-effects.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-operator-in-strlen-in-alloc.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-operator-in-strlen-in-alloc.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-operator-in-strlen-in-alloc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-operator-in-strlen-in-alloc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-operator-in-strlen-in-alloc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-pointer-arithmetic-in-alloc.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-pointer-arithmetic-in-alloc.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-pointer-arithmetic-in-alloc.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-pointer-arithmetic-in-alloc.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-pointer-arithmetic-in-alloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-pointer-arithmetic-in-alloc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-pointer-arithmetic-in-alloc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-pointer-arithmetic-in-alloc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-explicit-only.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-explicit-only.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-explicit-only.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-explicit-only.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-implicit-enabled.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-implicit-enabled.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-misplaced-widening-cast-implicit-enabled.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-implicit-enabled.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-move-forwarding-reference.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/move-forwarding-reference.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-move-forwarding-reference.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/move-forwarding-reference.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-multiple-statement-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/multiple-statement-macro.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-multiple-statement-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/multiple-statement-macro.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-no-escape.m b/clang-tools-extra/test/clang-tidy/checkers/bugprone/no-escape.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-no-escape.m
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/no-escape.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-in-initialization-strlen.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
similarity index 97%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-in-initialization-strlen.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
index 259427e3bcec7..6e83804b45c60 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-in-initialization-strlen.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-in-initialization-strlen.c
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-c.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-before-safe.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c
similarity index 97%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-before-safe.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c
index 2f09f55034ce0..0ee8561ff48dd 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-before-safe.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c
@@ -2,7 +2,7 @@
 // RUN: -config="{CheckOptions: \
 // RUN: [{key: bugprone-not-null-terminated-result.WantToUseSafeFunctions, \
 // RUN:   value: true}]}" \
-// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-c.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
index 747bbc308b5ca..97a7f268d469b 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c++11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-cxx.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-other.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-other.c
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-other.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-other.c
index 76972bc562ffb..606e0d8906fd7 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-other.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-other.c
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-c.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe.c
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe.c
index 9a2d48fcae296..5a5e35ef733f6 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe.c
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-c.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-stdc-want-lib-ext1-not-a-literal.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-stdc-want-lib-ext1-not-a-literal.c
similarity index 88%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-stdc-want-lib-ext1-not-a-literal.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-stdc-want-lib-ext1-not-a-literal.c
index bba807fb6e098..0628d0ca53300 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-stdc-want-lib-ext1-not-a-literal.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-stdc-want-lib-ext1-not-a-literal.c
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-c.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-strlen.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-strlen.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
index ea9d46ac5c9b4..6a907689921d0 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-strlen.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 // FIXME: Something wrong with the APInt un/signed conversion on Windows:
 // in 'strncmp(str6, "string", 7);' it tries to inject '4294967302' as length.

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-undef-stdc-want-lib-ext1.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-undef-stdc-want-lib-ext1.c
similarity index 88%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-undef-stdc-want-lib-ext1.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-undef-stdc-want-lib-ext1.c
index 25e38800d28b8..2704dc1ee513b 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-undef-stdc-want-lib-ext1.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-undef-stdc-want-lib-ext1.c
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-c.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wcslen.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wcslen.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
index 5edb4136d72d5..7eb9330b36a26 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wcslen.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c++11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result
 
 // FIXME: Something wrong with the APInt un/signed conversion on Windows:
 // in 'wcsncmp(wcs6, L"string", 7);' it tries to inject '4294967302' as length.

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wmemcpy-safe-cxx.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wmemcpy-safe-cxx.cpp
index 6c8aee0af13c7..948d483f539b5 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wmemcpy-safe-cxx.cpp
@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
-// RUN: -- -std=c++11 -I %S/Inputs/bugprone-not-null-terminated-result
+// RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-cxx.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-parent-virtual-call.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/parent-virtual-call.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-parent-virtual-call.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/parent-virtual-call.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-posix-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/posix-return.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-posix-return.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/posix-return.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-redundant-branch-condition.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/redundant-branch-condition.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-redundant-branch-condition.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/redundant-branch-condition.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier-c.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-c.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-c.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier-invert.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp
similarity index 95%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier-invert.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp
index 5e0baa80feebc..3edfb8dca6cb3 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier-invert.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp
@@ -3,8 +3,8 @@
 // RUN:     {key: bugprone-reserved-identifier.Invert, value: true}, \
 // RUN:     {key: bugprone-reserved-identifier.AllowedIdentifiers, value: std;reference_wrapper;ref;cref;type;get}, \
 // RUN:   ]}' -- \
-// RUN:   -I%S/Inputs/bugprone-reserved-identifier \
-// RUN:   -isystem %S/Inputs/bugprone-reserved-identifier/system
+// RUN:   -I%S/Inputs/reserved-identifier \
+// RUN:   -isystem %S/Inputs/reserved-identifier/system
 
 namespace std {
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier.cpp
index da8a27588611e..2baae86fd9de3 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s bugprone-reserved-identifier %t -- -- \
-// RUN:   -I%S/Inputs/bugprone-reserved-identifier \
-// RUN:   -isystem %S/Inputs/bugprone-reserved-identifier/system
+// RUN:   -I%S/Inputs/reserved-identifier \
+// RUN:   -isystem %S/Inputs/reserved-identifier/system
 
 // no warnings expected without -header-filter=
 #include "user-header.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-shared-ptr-array-mismatch.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/shared-ptr-array-mismatch.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-shared-ptr-array-mismatch.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/shared-ptr-array-mismatch.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-minimal.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c
similarity index 95%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-minimal.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c
index 7e88534aeb4b8..57c58fc6df684 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-minimal.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c
@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s bugprone-signal-handler %t \
 // RUN: -config='{CheckOptions: \
 // RUN:  [{key: bugprone-signal-handler.AsyncSafeFunctionSet, value: "minimal"}]}' \
-// RUN: -- -isystem %S/Inputs/Headers
+// RUN: -- -isystem %clang_tidy_headers
 
 #include "signal.h"
 #include "stdlib.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-posix.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c
similarity index 94%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-posix.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c
index 4fd8e863fd1af..54c5a841543c7 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-posix.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c
@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s bugprone-signal-handler %t \
 // RUN: -config='{CheckOptions: \
 // RUN:  [{key: bugprone-signal-handler.AsyncSafeFunctionSet, value: "POSIX"}]}' \
-// RUN: -- -isystem %S/Inputs/Headers
+// RUN: -- -isystem %clang_tidy_headers
 
 #include "signal.h"
 #include "stdlib.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c
index 27f431d432a88..51f7b07a39109 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-signal-handler %t -- -- -isystem %S/Inputs/Headers
+// RUN: %check_clang_tidy %s bugprone-signal-handler %t -- -- -isystem %clang_tidy_headers
 
 #include "signal.h"
 #include "stdlib.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-fsigned-char.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-fsigned-char.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-fsigned-char.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-fsigned-char.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-funsigned-char.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-funsigned-char.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-funsigned-char.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-funsigned-char.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-with-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-with-option.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse-with-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-with-option.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-signed-char-misuse.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-container.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-container.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-container.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-container.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-sizeof-expression.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-spuriously-wake-up-functions.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/spuriously-wake-up-functions.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-spuriously-wake-up-functions.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/spuriously-wake-up-functions.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-spuriously-wake-up-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/spuriously-wake-up-functions.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-spuriously-wake-up-functions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/spuriously-wake-up-functions.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-constructor.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-string-constructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/string-constructor.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-integer-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-integer-assignment.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-string-integer-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/string-integer-assignment.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-string-literal-with-embedded-nul.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/string-literal-with-embedded-nul.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-string-literal-with-embedded-nul.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/string-literal-with-embedded-nul.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-stringview-nullptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/stringview-nullptr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-stringview-nullptr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/stringview-nullptr.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage-strict.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage-strict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage-strict.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-enum-usage.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-include.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp
similarity index 95%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-include.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp
index 9f4dd12887046..969d0bfdf7ed0 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-include.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-suspicious-include %t -- -- -isystem %S/Inputs/Headers -fmodules
+// RUN: %check_clang_tidy %s bugprone-suspicious-include %t -- -- -isystem %clang_tidy_headers -fmodules
 
 // clang-format off
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison-32bits.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison-32bits.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison-32bits.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison-32bits.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memory-comparison.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memory-comparison.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memset-usage.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memset-usage.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memset-usage.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-memset-usage.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-memset-usage.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-missing-comma.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-missing-comma.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-missing-comma.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-missing-comma.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-constexpr.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon-constexpr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-constexpr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon-constexpr.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-fail.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon-fail.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-fail.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon-fail.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-semicolon.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-string-compare.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-swapped-arguments.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/swapped-arguments.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-swapped-arguments.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/swapped-arguments.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-terminating-continue.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/terminating-continue.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-terminating-continue.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/terminating-continue.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-throw-keyword-missing.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/throw-keyword-missing.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-throw-keyword-missing.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/throw-keyword-missing.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable-magniute-bits-upper-limit.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable-magniute-bits-upper-limit.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable-magniute-bits-upper-limit.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-too-small-loop-variable.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unchecked-optional-access.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-unchecked-optional-access.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp
index d28af7a37f4ea..6c79dad93e90f 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unchecked-optional-access.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-unchecked-optional-access %t -- -- -I %S/Inputs/
+// RUN: %check_clang_tidy %s bugprone-unchecked-optional-access %t -- -- -I %S/Inputs/unchecked-optional-access
 
 #include "absl/types/optional.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-undefined-memory-manipulation.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/undefined-memory-manipulation.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-undefined-memory-manipulation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/undefined-memory-manipulation.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/undelegated-constructor-cxx98.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/undelegated-constructor-cxx98.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/undelegated-constructor.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-undelegated-constructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/undelegated-constructor.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-exception-at-new.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-exception-at-new.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-exception-at-new.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-exception-at-new.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-unhandled-self-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii-crash.mm b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-raii-crash.mm
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii-crash.mm
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-raii-crash.mm

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-raii.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-raii.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-raii.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-custom.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value-custom.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-custom.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-unused-return-value.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-use-after-move.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/use-after-move.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-use-after-move.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/use-after-move.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone-virtual-near-miss.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/virtual-near-miss.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/bugprone-virtual-near-miss.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone/virtual-near-miss.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-dcl21-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/dcl21-cpp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-dcl21-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/dcl21-cpp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/dcl58-cpp.cpp
similarity index 97%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/dcl58-cpp.cpp
index 34ee368dffe2e..56eb843046d1f 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert/dcl58-cpp.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s cert-dcl58-cpp %t -- -- -std=c++1z -I %S/Inputs/Headers
+// RUN: %check_clang_tidy %s cert-dcl58-cpp %t -- -- -std=c++1z -I %clang_tidy_headers
 
 #include "system-header-simulation.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-env33-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert/env33-c.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-env33-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert/env33-c.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-err33-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert/err33-c.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-err33-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert/err33-c.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert/err34-c.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert/err34-c.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/err34-c.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-err34-c.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/err34-c.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-flp30-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert/flp30-c.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-flp30-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert/flp30-c.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.c b/clang-tools-extra/test/clang-tidy/checkers/cert/limited-randomness.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert/limited-randomness.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/limited-randomness.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-limited-randomness.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/limited-randomness.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-mem57-cpp-cpp17.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/mem57-cpp-cpp17.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-mem57-cpp-cpp17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/mem57-cpp-cpp17.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-mem57-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/mem57-cpp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-mem57-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/mem57-cpp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-msc32-c.c b/clang-tools-extra/test/clang-tidy/checkers/cert/msc32-c.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-msc32-c.c
rename to clang-tools-extra/test/clang-tidy/checkers/cert/msc32-c.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-msc51-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/msc51-cpp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-msc51-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/msc51-cpp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-oop11-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/oop11-cpp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-oop11-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/oop11-cpp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-oop54-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/oop54-cpp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-oop54-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/oop54-cpp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-oop57-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/oop57-cpp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-oop57-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/oop57-cpp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-oop58-cpp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/oop58-cpp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-oop58-cpp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/oop58-cpp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-setlongjmp.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/setlongjmp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-setlongjmp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/setlongjmp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-static-object-exception.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/static-object-exception.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-static-object-exception.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/static-object-exception.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-str34-c.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/str34-c.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-str34-c.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/str34-c.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-throw-exception-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/throw-exception-type.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-throw-exception-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/throw-exception-type.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp
index c19aacdd1b656..d6a0d56019d4f 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp
@@ -3,7 +3,7 @@
 // RUN: clang-tidy %t.cpp -checks='-*,cert-dcl16-c' -fix -- -I %S
 // RUN: clang-tidy %t.cpp -checks='-*,cert-dcl16-c' -warnings-as-errors='-*,cert-dcl16-c' -- -I %S
 
-#include "readability-uppercase-literal-suffix.h"
+#include "../readability/uppercase-literal-suffix.h"
 
 void integer_suffix() {
   static constexpr auto v0 = __LINE__; // synthetic

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cert-variadic-function-def.cpp b/clang-tools-extra/test/clang-tidy/checkers/cert/variadic-function-def.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cert-variadic-function-def.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cert/variadic-function-def.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-any.cpp b/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-any.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-any.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-any.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-glibc.cpp b/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-glibc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-glibc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-glibc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-posix.cpp b/clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-posix.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/concurrency-mt-unsafe-posix.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-posix.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/concurrency-thread-canceltype-asynchronous.cpp b/clang-tools-extra/test/clang-tidy/checkers/concurrency/thread-canceltype-asynchronous.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/concurrency-thread-canceltype-asynchronous.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/concurrency/thread-canceltype-asynchronous.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-goto.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-goto.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-goto.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-goto.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-non-const-global-variables.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-non-const-global-variables.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-avoid-non-const-global-variables.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-non-const-global-variables.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables-conflict.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/init-variables-conflict.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables-conflict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/init-variables-conflict.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/init-variables.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-init-variables.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/init-variables.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-interfaces-global-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/interfaces-global-init.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-interfaces-global-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/interfaces-global-init.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-caps-only.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-caps-only.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-caps-only.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-caps-only.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-command-line-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-command-line-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-command-line-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-command-line-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-custom.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage-custom.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-custom.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-macro-usage.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-bitfields.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-bitfields.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-bitfields.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-bitfields.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-equivalentbitwidth-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-equivalentbitwidth-option.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-equivalentbitwidth-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-equivalentbitwidth-option.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-ignoreconversionfromtypes-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-ignoreconversionfromtypes-option.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-ignoreconversionfromtypes-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-ignoreconversionfromtypes-option.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-intemplates-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-intemplates-option.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-intemplates-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-intemplates-option.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-long-is-32bits.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-long-is-32bits.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-long-is-32bits.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingfloatingpoint-option.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingfloatingpoint-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingfloatingpoint-option.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowinginteger-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowinginteger-option.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowinginteger-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowinginteger-option.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingintegertofloatingpoint-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingintegertofloatingpoint-option.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-narrowingintegertofloatingpoint-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingintegertofloatingpoint-option.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-pedanticmode-option.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-pedanticmode-option.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-pedanticmode-option.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-unsigned-char.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions-unsigned-char.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-unsigned-char.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-narrowing-conversions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-custom.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-custom.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-custom.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-no-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-no-functions.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc-no-functions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-no-functions.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-no-malloc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-containers.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-containers.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-containers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-containers.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-legacy-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-legacy-functions.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory-legacy-functions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-legacy-functions.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-owning-memory.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer-modernize-use-default-member-init-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init-assignment.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer-modernize-use-default-member-init-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init-assignment.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer-modernize-use-default-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer-modernize-use-default-member-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-prefer-member-initializer.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-array-to-pointer-decay.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-array-to-pointer-decay.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-array-to-pointer-decay.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-c++03.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-c++03.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-c++03.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-gslheader.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index-gslheader.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-gslheader.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-constant-array-index.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-pointer-arithmetic-pr36489.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic-pr36489.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-pointer-arithmetic-pr36489.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-pointer-arithmetic.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-bounds-pointer-arithmetic.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-pointer-arithmetic.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-const-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-const-cast.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-const-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-const-cast.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-cstyle-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-cstyle-cast.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-cstyle-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-cstyle-cast.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx20.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-cxx20.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx20.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-cxx20.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-cxx98.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-cxx98.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-delayed.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-delayed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-delayed.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-no-crash.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-no-crash.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-no-crash.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-no-crash.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-use-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init-use-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.ignorearrays.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.ignorearrays.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-member-init.ignorearrays.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.ignorearrays.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-reinterpret-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-reinterpret-cast.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-reinterpret-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-reinterpret-cast.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-static-cast-downcast.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-static-cast-downcast.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-static-cast-downcast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-static-cast-downcast.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-union-access.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-union-access.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-union-access.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-union-access.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg-ms.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-vararg-ms.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg-ms.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-vararg-ms.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-vararg.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-pro-type-vararg.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-vararg.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-slicing.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/slicing.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-slicing.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/slicing.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-allow-missing-move-when-copy-is-deleted.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-allow-missing-move-when-copy-is-deleted.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-allow-missing-move-when-copy-is-deleted.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-allow-missing-move-when-copy-is-deleted.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-cxx-03.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-cxx-03.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-cxx-03.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-cxx-03.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-relaxed.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-relaxed.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions-relaxed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-relaxed.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-special-member-functions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-virtual-class-destructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/virtual-class-destructor.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines-virtual-class-destructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/virtual-class-destructor.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/darwin-avoid-spinlock.m b/clang-tools-extra/test/clang-tidy/checkers/darwin/avoid-spinlock.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/darwin-avoid-spinlock.m
rename to clang-tools-extra/test/clang-tidy/checkers/darwin/avoid-spinlock.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/darwin-dispatch-once-nonstatic.mm b/clang-tools-extra/test/clang-tidy/checkers/darwin/dispatch-once-nonstatic.mm
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/darwin-dispatch-once-nonstatic.mm
rename to clang-tools-extra/test/clang-tidy/checkers/darwin/dispatch-once-nonstatic.mm

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-calls.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/default-arguments-calls.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-calls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia/default-arguments-calls.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-declarations.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/default-arguments-declarations.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/fuchsia-default-arguments-declarations.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia/default-arguments-declarations.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/fuchsia-multiple-inheritance.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/multiple-inheritance.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/fuchsia-multiple-inheritance.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia/multiple-inheritance.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/fuchsia-overloaded-operator.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/overloaded-operator.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/fuchsia-overloaded-operator.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia/overloaded-operator.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/fuchsia-statically-constructed-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/statically-constructed-objects.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/fuchsia-statically-constructed-objects.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia/statically-constructed-objects.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/fuchsia-trailing-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/trailing-return.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/fuchsia-trailing-return.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia/trailing-return.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/fuchsia-virtual-inheritance.cpp b/clang-tools-extra/test/clang-tidy/checkers/fuchsia/virtual-inheritance.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/fuchsia-virtual-inheritance.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/fuchsia/virtual-inheritance.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/google-namespaces.h b/clang-tools-extra/test/clang-tidy/checkers/google/Inputs/google-namespaces.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/google-namespaces.h
rename to clang-tools-extra/test/clang-tidy/checkers/google/Inputs/google-namespaces.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest-typed-test.h b/clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/gtest-typed-test.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest-typed-test.h
rename to clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/gtest-typed-test.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest.h b/clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/gtest.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/gtest.h
rename to clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/gtest.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest-typed-test.h b/clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest-typed-test.h
rename to clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/nosuite/gtest/gtest-typed-test.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest.h b/clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/nosuite/gtest/gtest.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/gtest/nosuite/gtest/gtest.h
rename to clang-tools-extra/test/clang-tidy/checkers/google/Inputs/gtest/nosuite/gtest/gtest.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-build-explicit-make-pair.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/build-explicit-make-pair.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-build-explicit-make-pair.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/build-explicit-make-pair.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-default-arguments.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/default-arguments.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-default-arguments.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/default-arguments.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-explicit-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/explicit-constructor.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-explicit-constructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/explicit-constructor.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-module.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/module.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-module.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/module.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-namespaces.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/namespaces.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-namespaces.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/namespaces.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-nsobject-new.m b/clang-tools-extra/test/clang-tidy/checkers/google/objc-avoid-nsobject-new.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-nsobject-new.m
rename to clang-tools-extra/test/clang-tidy/checkers/google/objc-avoid-nsobject-new.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-throwing-exception.m b/clang-tools-extra/test/clang-tidy/checkers/google/objc-avoid-throwing-exception.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-objc-avoid-throwing-exception.m
rename to clang-tools-extra/test/clang-tidy/checkers/google/objc-avoid-throwing-exception.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.m b/clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.m
rename to clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m
index 01433d9fa1ad7..4c204c7468256 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.m
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s google-objc-function-naming %t -- -- -isystem %S/Inputs/Headers
+// RUN: %check_clang_tidy %s google-objc-function-naming %t -- -- -isystem %clang_tidy_headers
 
 #include <stdio.h>
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.mm b/clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.mm
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-objc-function-naming.mm
rename to clang-tools-extra/test/clang-tidy/checkers/google/objc-function-naming.mm

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.m b/clang-tools-extra/test/clang-tidy/checkers/google/objc-global-variable-declaration.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.m
rename to clang-tools-extra/test/clang-tidy/checkers/google/objc-global-variable-declaration.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.mm b/clang-tools-extra/test/clang-tidy/checkers/google/objc-global-variable-declaration.mm
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-objc-global-variable-declaration.mm
rename to clang-tools-extra/test/clang-tidy/checkers/google/objc-global-variable-declaration.mm

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-overloaded-unary-and.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/overloaded-unary-and.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-overloaded-unary-and.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/overloaded-unary-and.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.c b/clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.c
similarity index 96%
rename from clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.c
rename to clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.c
index 488bcd796370f..f0d53395576a6 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.c
@@ -8,7 +8,7 @@
 #ifdef TEST_INCLUDE
 
 #undef TEST_INCLUDE
-#include "google-readability-casting.c"
+#include "readability-casting.c"
 
 #else
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.mm b/clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.mm
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-readability-casting.mm
rename to clang-tools-extra/test/clang-tidy/checkers/google/readability-casting.mm

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments-c++17.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/readability-namespace-comments-c++17.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments-c++17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/readability-namespace-comments-c++17.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/readability-namespace-comments.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-readability-namespace-comments.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/readability-namespace-comments.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-readability-todo.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/readability-todo.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-readability-todo.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/readability-todo.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int-std.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/runtime-int-std.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-runtime-int-std.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/runtime-int-std.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.c b/clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.c
rename to clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.m b/clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-runtime-int.m
rename to clang-tools-extra/test/clang-tidy/checkers/google/runtime-int.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/google-upgrade-googletest-case.cpp b/clang-tools-extra/test/clang-tidy/checkers/google/upgrade-googletest-case.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/google-upgrade-googletest-case.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/google/upgrade-googletest-case.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-exception-baseclass.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/exception-baseclass.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-exception-baseclass.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/exception-baseclass.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered-else.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered-else.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered-else.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered-else.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-multiway-paths-covered.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/no-assembler-msvc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler-msvc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/no-assembler-msvc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/no-assembler.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-no-assembler.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/no-assembler.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-bug34747.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-bug34747.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-bug34747.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-bug34747.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-integer-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-integer-literals.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-integer-literals.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-integer-literals.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-standard-types.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-standard-types.cpp
index b88b266ff4bbe..a2fe5835e0149 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-standard-types.cpp
@@ -1,7 +1,7 @@
 // RUN: clang-tidy %s -checks='-*,hicpp-signed-bitwise' -- -std=c++11
 // FIXME: Make the test work in all language modes.
 
-#include "hicpp-signed-bitwise-standard-types.h"
+#include "signed-bitwise-standard-types.h"
 
 void pure_bitmask_types() {
   // std::locale::category

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.h b/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-standard-types.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise-standard-types.h
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-standard-types.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise.cpp b/clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/hicpp-signed-bitwise.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/linuxkernel-must-check-errs.c b/clang-tools-extra/test/clang-tidy/checkers/linuxkernel/must-check-errs.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/linuxkernel-must-check-errs.c
rename to clang-tools-extra/test/clang-tidy/checkers/linuxkernel/must-check-errs.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm/include-order.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm/include-order.cpp
index d4da826ced386..6e8c748a9950b 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/llvm-include-order.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvm/include-order.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s llvm-include-order %t -- -- -isystem %S/Inputs/Headers
+// RUN: %check_clang_tidy %s llvm-include-order %t -- -- -isystem %clang_tidy_headers
 
 // CHECK-MESSAGES: [[@LINE+2]]:1: warning: #includes are not sorted properly
 #include "j.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-isa-or-dyn-cast-in-conditionals.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-isa-or-dyn-cast-in-conditionals.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-isa-or-dyn-cast-in-conditionals.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned2.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned2.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned2.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned2.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned3.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned3.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvm-prefer-register-over-unsigned3.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm/prefer-register-over-unsigned3.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvm-qualified-auto.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm/qualified-auto.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvm-qualified-auto.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm/qualified-auto.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvm-twine-local.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvm/twine-local.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvm-twine-local.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvm/twine-local.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/resource/include/stdatomic.h b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/resource/include/stdatomic.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/resource/include/stdatomic.h
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/resource/include/stdatomic.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/resource/include/stddef.h b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/resource/include/stddef.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/resource/include/stddef.h
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/resource/include/stddef.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/stdio.h b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdio.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/stdio.h
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdio.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/stdlib.h b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdlib.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/stdlib.h
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/stdlib.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/string.h b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/string.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/llvmlibc/system/string.h
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/Inputs/system/string.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvmlibc-callee-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/callee-namespace.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvmlibc-callee-namespace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/callee-namespace.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvmlibc-implementation-in-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/implementation-in-namespace.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/llvmlibc-implementation-in-namespace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/implementation-in-namespace.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/llvmlibc-restrict-system-libc-headers.cpp b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/restrict-system-libc-headers.cpp
similarity index 81%
rename from clang-tools-extra/test/clang-tidy/checkers/llvmlibc-restrict-system-libc-headers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/llvmlibc/restrict-system-libc-headers.cpp
index 52e25faf190fd..cf27ccbd270cd 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/llvmlibc-restrict-system-libc-headers.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/llvmlibc/restrict-system-libc-headers.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s llvmlibc-restrict-system-libc-headers %t \
-// RUN:   -- -- -isystem %S/Inputs/llvmlibc/system \
-// RUN:   -resource-dir %S/Inputs/llvmlibc/resource
+// RUN:   -- -- -isystem %S/Inputs/system \
+// RUN:   -resource-dir %S/Inputs/resource
 
 #include <stdio.h>
 // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: system include stdio.h not allowed

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/unused-using-decls.h b/clang-tools-extra/test/clang-tidy/checkers/misc/Inputs/unused-using-decls.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/unused-using-decls.h
rename to clang-tools-extra/test/clang-tidy/checkers/misc/Inputs/unused-using-decls.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-confusable-identifiers.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/confusable-identifiers.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-confusable-identifiers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/confusable-identifiers.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers-1z.hpp b/clang-tools-extra/test/clang-tidy/checkers/misc/definitions-in-headers-1z.hpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers-1z.hpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/definitions-in-headers-1z.hpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers.hpp b/clang-tools-extra/test/clang-tidy/checkers/misc/definitions-in-headers.hpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-definitions-in-headers.hpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/definitions-in-headers.hpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/misleading-bidirectional.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/misleading-bidirectional.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/misleading-identifier.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/misleading-identifier.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const-cxx17.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const-cxx17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const-cxx17.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.c b/clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.c
rename to clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-misplaced-const.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads-sized-dealloc.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/new-delete-overloads-sized-dealloc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads-sized-dealloc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/new-delete-overloads-sized-dealloc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/new-delete-overloads.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-new-delete-overloads.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/new-delete-overloads.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-no-recursion.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/no-recursion.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-no-recursion.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/no-recursion.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.c b/clang-tools-extra/test/clang-tidy/checkers/misc/non-copyable-objects.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.c
rename to clang-tools-extra/test/clang-tidy/checkers/misc/non-copyable-objects.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/non-copyable-objects.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-non-copyable-objects.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/non-copyable-objects.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-non-private-member-variables-in-classes.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/non-private-member-variables-in-classes.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-non-private-member-variables-in-classes.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/non-private-member-variables-in-classes.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/redundant-expression.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-redundant-expression.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/redundant-expression.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.c b/clang-tools-extra/test/clang-tidy/checkers/misc/static-assert.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.c
rename to clang-tools-extra/test/clang-tidy/checkers/misc/static-assert.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/static-assert.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-static-assert.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/static-assert.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-throw-by-value-catch-by-reference.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/throw-by-value-catch-by-reference.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-throw-by-value-catch-by-reference.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/throw-by-value-catch-by-reference.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator-cxx17.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-cxx17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator-cxx17.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-precxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator-precxx11.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator-precxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator-precxx11.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator.cpp
index b010a8a230bcc..566773ff3f5c4 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc-unconventional-assign-operator.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/unconventional-assign-operator.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-unconventional-assign-operator %t -- -- -isystem %S/Inputs/Headers -fno-delayed-template-parsing
+// RUN: %check_clang_tidy %s misc-unconventional-assign-operator %t -- -- -fno-delayed-template-parsing
 
 namespace std {
 template <typename T>

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-uniqueptr-reset-release.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/uniqueptr-reset-release.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-uniqueptr-reset-release.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/uniqueptr-reset-release.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-alias-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-alias-decls.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unused-alias-decls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unused-alias-decls.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-invalid-parameter.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-invalid-parameter.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unused-invalid-parameter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unused-invalid-parameter.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters-strict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.c b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.c
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls-cxx17.cpp
similarity index 86%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-cxx17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls-cxx17.cpp
index 2c2edcf4df778..69e9cf7e3d3f7 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-cxx17.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls-cxx17.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++17-or-later %s misc-unused-using-decls %t -- --fix-notes -- -fno-delayed-template-parsing -isystem %S/Inputs/
+// RUN: %check_clang_tidy -std=c++17-or-later %s misc-unused-using-decls %t -- --fix-notes -- -fno-delayed-template-parsing
 
 namespace ns {
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-errors.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls-errors.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls-errors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls-errors.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls.cpp
index 297649e0abcee..63bf34cfafe9e 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc-unused-using-decls.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-unused-using-decls %t -- --fix-notes -- -fno-delayed-template-parsing -isystem %S/Inputs/
+// RUN: %check_clang_tidy %s misc-unused-using-decls %t -- --fix-notes -- -fno-delayed-template-parsing -isystem %S/Inputs
 
 // ----- Definitions -----
 template <typename T> class vector {};

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-concat-nested-namespaces/modernize-concat-nested-namespaces.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/concat-nested-namespaces/modernize-concat-nested-namespaces.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-concat-nested-namespaces/modernize-concat-nested-namespaces.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/concat-nested-namespaces/modernize-concat-nested-namespaces.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/assert.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/assert.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/assert.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/assert.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/complex.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/complex.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/complex.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/complex.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/ctype.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/ctype.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/ctype.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/ctype.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/errno.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/errno.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/errno.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/errno.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/fenv.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/fenv.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/fenv.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/fenv.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/float.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/float.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/float.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/float.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/inttypes.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/inttypes.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/inttypes.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/inttypes.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/iso646.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/iso646.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/iso646.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/iso646.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/limits.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/limits.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/limits.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/limits.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/locale.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/locale.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/locale.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/locale.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/math.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/math.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/math.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/math.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/mylib.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/mylib.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/mylib.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/mylib.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/mysystemlib.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/mysystemlib.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/mysystemlib.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/mysystemlib.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/setjmp.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/setjmp.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/setjmp.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/setjmp.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/signal.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/signal.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/signal.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/signal.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdalign.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdalign.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdalign.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdalign.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdarg.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdarg.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdarg.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdarg.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdbool.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdbool.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdbool.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdbool.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stddef.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stddef.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stddef.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stddef.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdint.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdint.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdint.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdint.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdio.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdio.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdio.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdio.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdlib.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdlib.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/stdlib.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/stdlib.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/string.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/string.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/string.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/string.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/tgmath.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/tgmath.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/tgmath.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/tgmath.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/time.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/time.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/time.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/time.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/uchar.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/uchar.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/uchar.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/uchar.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wchar.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/wchar.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wchar.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/wchar.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wctype.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/wctype.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-deprecated-headers/wctype.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/deprecated-headers/wctype.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-loop-convert/structures.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-loop-convert/structures.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/loop-convert/structures.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum2.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum2.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum2.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum2.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum3.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum3.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-macro-to-enum/modernize-macro-to-enum3.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/macro-to-enum/modernize-macro-to-enum3.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header-with-fix.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/pass-by-value/header-with-fix.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header-with-fix.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/pass-by-value/header-with-fix.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/pass-by-value/header.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-pass-by-value/header.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/pass-by-value/header.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-replace-auto-ptr/memory.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/replace-auto-ptr/memory.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-replace-auto-ptr/memory.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/replace-auto-ptr/memory.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/initializer_list.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/initializer_list.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/initializer_list.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/initializer_list.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/shared_ptr.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/shared_ptr.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/shared_ptr.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/shared_ptr.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/unique_ptr.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/unique_ptr.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-smart-ptr/unique_ptr.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/smart-ptr/unique_ptr.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-auto/containers.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/use-auto/containers.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-auto/containers.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/use-auto/containers.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-using/modernize-use-using.h b/clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/use-using/modernize-use-using.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/modernize-use-using/modernize-use-using.h
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/Inputs/use-using/modernize-use-using.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind-permissive-parameter-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind-permissive-parameter-list.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind-permissive-parameter-list.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind-permissive-parameter-list.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-bind.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-main.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays-ignores-main.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-main.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays-ignores-main.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-three-arg-main.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays-ignores-three-arg-main.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays-ignores-three-arg-main.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays-ignores-three-arg-main.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-avoid-c-arrays.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-c-arrays.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-concat-nested-namespaces.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp
similarity index 88%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-concat-nested-namespaces.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp
index 7c13c1c61cf20..17740b3c6af50 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-concat-nested-namespaces.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp
@@ -1,10 +1,10 @@
-// RUN: cp %S/Inputs/modernize-concat-nested-namespaces/modernize-concat-nested-namespaces.h %T/modernize-concat-nested-namespaces.h
+// RUN: cp %S/Inputs/concat-nested-namespaces/modernize-concat-nested-namespaces.h %T/modernize-concat-nested-namespaces.h
 // RUN: %check_clang_tidy -std=c++17 %s modernize-concat-nested-namespaces %t -- -header-filter=".*" -- -I %T
-// RUN: FileCheck -input-file=%T/modernize-concat-nested-namespaces.h %S/Inputs/modernize-concat-nested-namespaces/modernize-concat-nested-namespaces.h -check-prefix=CHECK-FIXES
+// RUN: FileCheck -input-file=%T/modernize-concat-nested-namespaces.h %S/Inputs/concat-nested-namespaces/modernize-concat-nested-namespaces.h -check-prefix=CHECK-FIXES
 // Restore header file and re-run with c++20:
-// RUN: cp %S/Inputs/modernize-concat-nested-namespaces/modernize-concat-nested-namespaces.h %T/modernize-concat-nested-namespaces.h
+// RUN: cp %S/Inputs/concat-nested-namespaces/modernize-concat-nested-namespaces.h %T/modernize-concat-nested-namespaces.h
 // RUN: %check_clang_tidy -std=c++20 %s modernize-concat-nested-namespaces %t -- -header-filter=".*" -- -I %T
-// RUN: FileCheck -input-file=%T/modernize-concat-nested-namespaces.h %S/Inputs/modernize-concat-nested-namespaces/modernize-concat-nested-namespaces.h -check-prefix=CHECK-FIXES
+// RUN: FileCheck -input-file=%T/modernize-concat-nested-namespaces.h %S/Inputs/concat-nested-namespaces/modernize-concat-nested-namespaces.h -check-prefix=CHECK-FIXES
 
 #include "modernize-concat-nested-namespaces.h"
 // CHECK-MESSAGES-DAG: modernize-concat-nested-namespaces.h:1:1: warning: nested namespaces can be concatenated [modernize-concat-nested-namespaces]

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx03.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-cxx03.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx03.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-cxx03.cpp
index 4511f46d57b33..f01d6a677e27b 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx03.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-cxx03.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++98 %s modernize-deprecated-headers %t -- -extra-arg-before=-isystem%S/Inputs/modernize-deprecated-headers
+// RUN: %check_clang_tidy -std=c++98 %s modernize-deprecated-headers %t -- -extra-arg-before=-isystem%S/Inputs/deprecated-headers
 
 #include <assert.h>
 // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead [modernize-deprecated-headers]

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-cxx11.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-cxx11.cpp
index c3374a9123bd1..29c5dc4eb9762 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-cxx11.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-cxx11.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++11-or-later %s modernize-deprecated-headers %t -- -extra-arg-before=-isystem%S/Inputs/modernize-deprecated-headers
+// RUN: %check_clang_tidy -std=c++11-or-later %s modernize-deprecated-headers %t -- -extra-arg-before=-isystem%S/Inputs/deprecated-headers
 
 #include <assert.h>
 // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: inclusion of deprecated C++ header 'assert.h'; consider using 'cassert' instead [modernize-deprecated-headers]

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-extern-c.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp
similarity index 86%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-extern-c.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp
index 1193c2ad0a996..80edf384c6bc8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-headers-extern-c.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp
@@ -4,19 +4,19 @@
 // absolute file paths which is sorted by clang-tidy prior emitting.
 //
 // RUN: mkdir -p %t/sys && mkdir -p %t/usr \
-// RUN:   && cp %S/Inputs/modernize-deprecated-headers/mysystemlib.h %t/sys/mysystemlib.h \
-// RUN:   && cp %S/Inputs/modernize-deprecated-headers/mylib.h       %t/usr/mylib.h
+// RUN:   && cp %S/Inputs/deprecated-headers/mysystemlib.h %t/sys/mysystemlib.h \
+// RUN:   && cp %S/Inputs/deprecated-headers/mylib.h       %t/usr/mylib.h
 
 // RUN: %check_clang_tidy -std=c++11 %s modernize-deprecated-headers %t \
 // RUN:   -check-suffixes=DEFAULT \
 // RUN:   --header-filter='.*' --system-headers \
-// RUN:   -- -I %t/usr -isystem %t/sys -isystem %S/Inputs/modernize-deprecated-headers
+// RUN:   -- -I %t/usr -isystem %t/sys -isystem %S/Inputs/deprecated-headers
 
 // RUN: %check_clang_tidy -std=c++11 %s modernize-deprecated-headers %t \
 // RUN:   -check-suffixes=DEFAULT,CHECK-HEADER-FILE \
 // RUN:   -config="{CheckOptions: [{key: modernize-deprecated-headers.CheckHeaderFile, value: 'true'}]}" \
 // RUN:   --header-filter='.*' --system-headers \
-// RUN:   -- -I %t/usr -isystem %t/sys -isystem %S/Inputs/modernize-deprecated-headers
+// RUN:   -- -I %t/usr -isystem %t/sys -isystem %S/Inputs/deprecated-headers
 
 // REQUIRES: system-linux
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-ios-base-aliases.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-ios-base-aliases.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-deprecated-ios-base-aliases.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-ios-base-aliases.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-assert-failure.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-assert-failure.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-assert-failure.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-assert-failure.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-basic.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-basic.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
index 046270abc6b3f..b42ce4a19a6b7 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-basic.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-basic.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-loop-convert %t -- -- -I %S/Inputs/modernize-loop-convert
+// RUN: %check_clang_tidy %s modernize-loop-convert %t -- -- -I %S/Inputs/loop-convert
 
 #include "structures.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-camelback.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp
similarity index 95%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-camelback.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp
index 42c492f58b5a5..341287ed18194 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-camelback.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \
 // RUN:   -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'camelBack'}]}" \
-// RUN:   -- -I %S/Inputs/modernize-loop-convert
+// RUN:   -- -I %S/Inputs/loop-convert
 
 #include "structures.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-const.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-const.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-const.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-extra.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-extra.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-extra.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-extra.cpp
index d57c335d922bc..d52d0492034df 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-extra.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-extra.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-loop-convert %t -- -- -I %S/Inputs/modernize-loop-convert
+// RUN: %check_clang_tidy %s modernize-loop-convert %t -- -- -I %S/Inputs/loop-convert
 
 #include "structures.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-lowercase.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp
similarity index 96%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-lowercase.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp
index 1389376b2e4d7..883b4d73b1aec 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-lowercase.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \
 // RUN:   -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'lower_case'}]}" \
-// RUN:   -- -I %S/Inputs/modernize-loop-convert
+// RUN:   -- -I %S/Inputs/loop-convert
 
 #include "structures.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-multidimensional.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-multidimensional.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-multidimensional.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-multidimensional.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-negative.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-negative.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-negative.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-negative.cpp
index 607baaed5dd38..e6957403b77d5 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-negative.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-negative.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-loop-convert %t -- -- -I %S/Inputs/modernize-loop-convert
+// RUN: %check_clang_tidy %s modernize-loop-convert %t -- -- -I %S/Inputs/loop-convert
 
 #include "structures.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-reverse.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-reverse.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-reverse.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-reverse.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-rewritten-binop.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-rewritten-binop.cpp
similarity index 97%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-rewritten-binop.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-rewritten-binop.cpp
index d19d53a035383..485fa661b525c 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-rewritten-binop.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-rewritten-binop.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++20 %s modernize-loop-convert %t -- -- -I %S/Inputs/modernize-loop-convert
+// RUN: %check_clang_tidy -std=c++20 %s modernize-loop-convert %t -- -- -I %S/Inputs/loop-convert
 
 namespace std {
 struct strong_ordering {

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-uppercase.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp
similarity index 96%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-uppercase.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp
index 09e5f45ed0402..f85e20c572092 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert-uppercase.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \
 // RUN:   -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'UPPER_CASE'}]}" \
-// RUN:   -- -I %S/Inputs/modernize-loop-convert
+// RUN:   -- -I %S/Inputs/loop-convert
 
 #include "structures.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert.c b/clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-loop-convert.c
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-macro-to-enum.c b/clang-tools-extra/test/clang-tidy/checkers/modernize/macro-to-enum.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-macro-to-enum.c
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/macro-to-enum.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-macro-to-enum.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/macro-to-enum.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-macro-to-enum.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/macro-to-enum.cpp
index 4a697930d0f09..e2df29d2d163e 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-macro-to-enum.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/macro-to-enum.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++14-or-later %s modernize-macro-to-enum %t -- -- -I%S/Inputs/modernize-macro-to-enum -fno-delayed-template-parsing
+// RUN: %check_clang_tidy -std=c++14-or-later %s modernize-macro-to-enum %t -- -- -I%S/Inputs/macro-to-enum -fno-delayed-template-parsing
 // C++14 or later required for binary literals.
 
 #if 1

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp
similarity index 93%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp
index 8f293312f0d6b..ab090be0ec9cf 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp
@@ -5,7 +5,7 @@
 // RUN:      {key: modernize-make-shared.MakeSmartPtrFunctionHeader, \
 // RUN:       value: 'make_shared_util.h'} \
 // RUN:     ]}" \
-// RUN:   -- -I %S/Inputs/modernize-smart-ptr
+// RUN:   -- -I %S/Inputs/smart-ptr
 
 #include "shared_ptr.h"
 // CHECK-FIXES: #include "make_shared_util.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared.cpp
index 21f9cb116ec72..2698036e4bd2e 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-shared.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-make-shared %t -- -- -I %S/Inputs/modernize-smart-ptr
+// RUN: %check_clang_tidy %s modernize-make-shared %t -- -- -I %S/Inputs/smart-ptr
 
 #include "shared_ptr.h"
 // CHECK-FIXES: #include <memory>

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-cxx11.cpp
similarity index 86%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-cxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-cxx11.cpp
index 9cd58b4198fc7..e2944b8080c53 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-cxx11.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-cxx11.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++11 %s modernize-make-unique %t -- -- -I %S/Inputs/modernize-smart-ptr
+// RUN: %check_clang_tidy -std=c++11 %s modernize-make-unique %t -- -- -I %S/Inputs/smart-ptr
 
 #include "unique_ptr.h"
 // CHECK-FIXES: #include "unique_ptr.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-default-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-default-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp
index 2d79e70078434..5441b3843bb9c 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-default-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp
@@ -3,7 +3,7 @@
 // RUN:             [{key: modernize-make-unique.IgnoreDefaultInitialization, \
 // RUN:               value: 'false'}] \
 // RUN:             }" \
-// RUN:   -- -I %S/Inputs/modernize-smart-ptr
+// RUN:   -- -I %S/Inputs/smart-ptr
 
 #include "initializer_list.h"
 #include "unique_ptr.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp
similarity index 93%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp
index 88d82d6b38c7c..5cbd74aec8406 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp
@@ -5,7 +5,7 @@
 // RUN:      {key: modernize-make-unique.MakeSmartPtrFunctionHeader, \
 // RUN:       value: 'make_unique_util.h'} \
 // RUN:     ]}" \
-// RUN:   -- -I %S/Inputs/modernize-smart-ptr
+// RUN:   -- -I %S/Inputs/smart-ptr
 
 #include "unique_ptr.h"
 // CHECK-FIXES: #include "make_unique_util.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-inaccessible-ctors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-inaccessible-ctors.cpp
similarity index 97%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-inaccessible-ctors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-inaccessible-ctors.cpp
index 6fea6afb0a6fb..0f0cfd944f3f5 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-inaccessible-ctors.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-inaccessible-ctors.cpp
@@ -1,5 +1,5 @@
-// RUN: %check_clang_tidy -std=c++14,c++17 -check-suffix=CXX-14-17 %s modernize-make-unique %t -- -- -I %S/Inputs/modernize-smart-ptr -D CXX_14_17=1
-// RUN: %check_clang_tidy -std=c++20 -check-suffix=CXX-20 %s modernize-make-unique %t -- -- -I %S/Inputs/modernize-smart-ptr -D CXX_20=1
+// RUN: %check_clang_tidy -std=c++14,c++17 -check-suffix=CXX-14-17 %s modernize-make-unique %t -- -- -I %S/Inputs/smart-ptr -D CXX_14_17=1
+// RUN: %check_clang_tidy -std=c++20 -check-suffix=CXX-20 %s modernize-make-unique %t -- -- -I %S/Inputs/smart-ptr -D CXX_20=1
 
 #include "unique_ptr.h"
 // CHECK-FIXES: #include <memory>

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp
similarity index 95%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp
index 1805bc2bbab9c..6a8006dcb84a3 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy -std=c++14-or-later %s modernize-make-unique %t -- \
 // RUN:   -config="{CheckOptions: [{key: modernize-make-unique.IgnoreMacros, value: false}]}" \
-// RUN:   -- -I %S/Inputs/modernize-smart-ptr
+// RUN:   -- -I %S/Inputs/smart-ptr
 
 #include "unique_ptr.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique.cpp
index f4241be20042f..7934c6e93ffbd 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-make-unique.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++14-or-later %s modernize-make-unique %t -- -- -I %S/Inputs/modernize-smart-ptr
+// RUN: %check_clang_tidy -std=c++14-or-later %s modernize-make-unique %t -- -- -I %S/Inputs/smart-ptr
 
 #include "unique_ptr.h"
 #include "initializer_list.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-header.cpp
similarity index 87%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-header.cpp
index 992ad27c61fdf..5d2f1afde4b2f 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-header.cpp
@@ -1,4 +1,4 @@
-// RUN: cp %S/Inputs/modernize-pass-by-value/header.h %T/pass-by-value-header.h
+// RUN: cp %S/Inputs/pass-by-value/header.h %T/pass-by-value-header.h
 // RUN: clang-tidy %s -checks='-*,modernize-pass-by-value' -header-filter='.*' -fix -- -std=c++11 -I %T | FileCheck %s -check-prefix=CHECK-MESSAGES -implicit-check-not="{{warning|error}}:"
 // RUN: FileCheck -input-file=%T/pass-by-value-header.h %s -check-prefix=CHECK-FIXES
 // FIXME: Make the test work in all language modes.

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-macro-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-macro-header.cpp
similarity index 93%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-macro-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-macro-header.cpp
index 5bfe680f58353..384a86ded2ee8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-macro-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-macro-header.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-pass-by-value %t -- -- -isystem %S/Inputs/Headers
+// RUN: %check_clang_tidy %s modernize-pass-by-value %t -- -- -isystem %clang_tidy_headers
 
 // CHECK-FIXES: #include <utility>
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-multi-fixes.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-multi-fixes.cpp
similarity index 87%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-multi-fixes.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-multi-fixes.cpp
index 7980c301c5781..238e4454393a1 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value-multi-fixes.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value-multi-fixes.cpp
@@ -1,4 +1,4 @@
-// RUN: cat %S/Inputs/modernize-pass-by-value/header-with-fix.h > %T/pass-by-value-header-with-fix.h
+// RUN: cat %S/Inputs/pass-by-value/header-with-fix.h > %T/pass-by-value-header-with-fix.h
 // RUN: sed -e 's#//.*$##' %s > %t.cpp
 // RUN: clang-tidy %t.cpp -checks='-*,modernize-pass-by-value' -header-filter='.*' -fix -- -std=c++11 -I %T | FileCheck %s -check-prefix=CHECK-MESSAGES -implicit-check-not="{{warning|error}}:"
 // RUN: FileCheck -input-file=%t.cpp %s -check-prefix=CHECK-FIXES

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-pass-by-value.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/pass-by-value.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-delimiter.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-delimiter.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-delimiter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-delimiter.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-replace-shorter.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-replace-shorter.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal-replace-shorter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-replace-shorter.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-raw-string-literal.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg-delayed.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg-delayed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg-delayed.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.c b/clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.c
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-redundant-void-arg.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-auto-ptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/replace-auto-ptr.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-replace-auto-ptr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/replace-auto-ptr.cpp
index c54ba1c75c69b..6b8debd0d0e82 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-auto-ptr.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/replace-auto-ptr.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-replace-auto-ptr %t -- -- -I %S/Inputs/modernize-replace-auto-ptr
+// RUN: %check_clang_tidy %s modernize-replace-auto-ptr %t -- -- -I %S/Inputs/replace-auto-ptr
 
 // CHECK-FIXES: #include <utility>
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-disallow-copy-and-assign-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/replace-disallow-copy-and-assign-macro.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-replace-disallow-copy-and-assign-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/replace-disallow-copy-and-assign-macro.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-replace-random-shuffle.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/replace-random-shuffle.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-replace-random-shuffle.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/replace-random-shuffle.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-return-braced-init-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/return-braced-init-list.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-return-braced-init-list.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/return-braced-init-list.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-shrink-to-fit.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/shrink-to-fit.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-shrink-to-fit.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/shrink-to-fit.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-unary-static-assert.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/unary-static-assert.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-unary-static-assert.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/unary-static-assert.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast-remove-stars.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast-remove-stars.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp
index 47c12471fec69..555a685b72a0c 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-cast.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s modernize-use-auto %t -- \
 // RUN:   -config="{CheckOptions: [{key: modernize-use-auto.MinTypeNameLength, value: '0'}]}" \
-// RUN:   -- -I %S/Inputs/modernize-use-auto -frtti
+// RUN:   -- -I %S/Inputs/use-auto -frtti
 
 struct A {
   virtual ~A() {}

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-iterator.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-iterator.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-iterator.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-iterator.cpp
index 9690972a97ce9..2663495ccfecc 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-iterator.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-iterator.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++11,c++14 %s modernize-use-auto %t -- -- -I %S/Inputs/modernize-use-auto
+// RUN: %check_clang_tidy -std=c++11,c++14 %s modernize-use-auto %t -- -- -I %S/Inputs/use-auto
 // FIXME: Fix the checker to work in C++17 mode.
 
 #include "containers.h"

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-min-type-name-length.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-min-type-name-length.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new-remove-stars.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new-remove-stars.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new-remove-stars.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new-remove-stars.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-auto-new.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals-ignore-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals-ignore-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals-ignore-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals-ignore-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-bool-literals.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-assignment.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-assignment.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-bitfield.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-bitfield.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-bitfield.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-bitfield.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-default-member-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace-ignore-implicit-constructors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace-ignore-implicit-constructors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-emplace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-copy.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-copy.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-delayed.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-delayed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-delayed.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-default.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-equals-delete.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-clang-unused.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-clang-unused.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-clang-unused.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-clang-unused.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-cxx11.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-cxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-cxx11.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-gcc-unused.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-gcc-unused.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-gcc-unused.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-gcc-unused.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro-inscope-cxx11.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro-inscope-cxx11.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro-inscope-cxx11.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard-no-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nodiscard.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-error.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-error.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-error.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-error.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-macro.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-macro.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-opt.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-opt.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept-opt.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept-opt.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-noexcept.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-noexcept.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-basic.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr-basic.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-basic.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr-basic.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-cxx20.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr-cxx20.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr-cxx20.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr-cxx20.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.c b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.c
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-nullptr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-nullptr.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-allow-override-and-final.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-allow-override-and-final.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-allow-override-and-final.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-allow-override-and-final.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-cxx98.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-cxx98.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-ms.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-ms.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-ms.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-ms.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-no-destructors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-no-destructors.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-no-destructors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-no-destructors.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-macro.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-macro.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-no-macro-inscope.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-no-macro-inscope.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-override-with-no-macro-inscope.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-with-no-macro-inscope.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-override.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-override.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type-cxx20.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-cxx20.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type-cxx20.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-cxx20.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-transparent-functors.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-transparent-functors.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-transparent-functors.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-transparent-functors.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-uncaught-exceptions.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-uncaught-exceptions.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-uncaught-exceptions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-uncaught-exceptions.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-using-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-using-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp
index ec4ea61426582..14469e31c8262 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize-use-using.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-use-using %t -- -- -I %S/Inputs/modernize-use-using/
+// RUN: %check_clang_tidy %s modernize-use-using %t -- -- -I %S/Inputs/use-using/
 
 typedef int Type;
 // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef' [modernize-use-using]

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/mpi-type-mismatch/mpimock.h b/clang-tools-extra/test/clang-tidy/checkers/mpi/Inputs/type-mismatch/mpimock.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/mpi-type-mismatch/mpimock.h
rename to clang-tools-extra/test/clang-tidy/checkers/mpi/Inputs/type-mismatch/mpimock.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/mpi-buffer-deref.cpp b/clang-tools-extra/test/clang-tidy/checkers/mpi/buffer-deref.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/mpi-buffer-deref.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/mpi/buffer-deref.cpp
index 47d58a5a6c401..4a453f66dea03 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/mpi-buffer-deref.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/mpi/buffer-deref.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: static-analyzer
-// RUN: %check_clang_tidy %s mpi-buffer-deref %t -- -- -I %S/Inputs/mpi-type-mismatch
+// RUN: %check_clang_tidy %s mpi-buffer-deref %t -- -- -I %S/Inputs/type-mismatch
 
 #include "mpimock.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/mpi-type-mismatch.cpp b/clang-tools-extra/test/clang-tidy/checkers/mpi/type-mismatch.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/mpi-type-mismatch.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/mpi/type-mismatch.cpp
index bf978dcc1884d..a2d91b5848afa 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/mpi-type-mismatch.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/mpi/type-mismatch.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: static-analyzer
-// RUN: %check_clang_tidy %s mpi-type-mismatch %t -- -- -I %S/Inputs/mpi-type-mismatch
+// RUN: %check_clang_tidy %s mpi-type-mismatch %t -- -- -I %S/Inputs/type-mismatch
 
 #include "mpimock.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/objc-assert/XCTestAssertions.h b/clang-tools-extra/test/clang-tidy/checkers/objc/Inputs/assert/XCTestAssertions.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/objc-assert/XCTestAssertions.h
rename to clang-tools-extra/test/clang-tidy/checkers/objc/Inputs/assert/XCTestAssertions.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-assert-equals.m b/clang-tools-extra/test/clang-tidy/checkers/objc/assert-equals.m
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-assert-equals.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/assert-equals.m
index 2620bb86c3a65..e7787cf09fc08 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/objc-assert-equals.m
+++ b/clang-tools-extra/test/clang-tidy/checkers/objc/assert-equals.m
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s objc-assert-equals %t -- -- -I %S/Inputs/objc-assert
+// RUN: %check_clang_tidy %s objc-assert-equals %t -- -- -I %S/Inputs/assert
 #include "XCTestAssertions.h"
 // Can't reference NSString directly so we use this getStr() instead.
 __typeof(@"abc") getStr(void) {

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-avoid-nserror-init.m b/clang-tools-extra/test/clang-tidy/checkers/objc/avoid-nserror-init.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-avoid-nserror-init.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/avoid-nserror-init.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-dealloc-in-category.m b/clang-tools-extra/test/clang-tidy/checkers/objc/dealloc-in-category.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-dealloc-in-category.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/dealloc-in-category.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing-custom.m b/clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing-custom.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing-custom.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing-custom.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing.m b/clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-forbidden-subclassing.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/forbidden-subclassing.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-missing-hash.m b/clang-tools-extra/test/clang-tidy/checkers/objc/missing-hash.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-missing-hash.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/missing-hash.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-nsinvocation-argument-lifetime.m b/clang-tools-extra/test/clang-tidy/checkers/objc/nsinvocation-argument-lifetime.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-nsinvocation-argument-lifetime.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/nsinvocation-argument-lifetime.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-property-declaration.m b/clang-tools-extra/test/clang-tidy/checkers/objc/property-declaration.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-property-declaration.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/property-declaration.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/objc-super-self.m b/clang-tools-extra/test/clang-tidy/checkers/objc/super-self.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/objc-super-self.m
rename to clang-tools-extra/test/clang-tidy/checkers/objc/super-self.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/openmp-exception-escape.cpp b/clang-tools-extra/test/clang-tidy/checkers/openmp/exception-escape.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/openmp-exception-escape.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/openmp/exception-escape.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/openmp-use-default-none.cpp b/clang-tools-extra/test/clang-tidy/checkers/openmp/use-default-none.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/openmp-use-default-none.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/openmp/use-default-none.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header-fixed.h b/clang-tools-extra/test/clang-tidy/checkers/performance/Inputs/unnecessary-value-param/header-fixed.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header-fixed.h
rename to clang-tools-extra/test/clang-tidy/checkers/performance/Inputs/unnecessary-value-param/header-fixed.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header.h b/clang-tools-extra/test/clang-tidy/checkers/performance/Inputs/unnecessary-value-param/header.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/performance-unnecessary-value-param/header.h
rename to clang-tools-extra/test/clang-tidy/checkers/performance/Inputs/unnecessary-value-param/header.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-faster-string-find.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-faster-string-find.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/faster-string-find.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-allowed-types.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-allowed-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-allowed-types.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-warn-on-all-auto-copies.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-warn-on-all-auto-copies.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy-warn-on-all-auto-copies.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy-warn-on-all-auto-copies.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-for-range-copy.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/for-range-copy.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-implicit-conversion-in-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/implicit-conversion-in-loop.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-implicit-conversion-in-loop.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/implicit-conversion-in-loop.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-algorithm.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-algorithm.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-algorithm.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-algorithm.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-string-concatenation.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-string-concatenation.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-string-concatenation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-string-concatenation.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-vector-operation.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/inefficient-vector-operation.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-const-ref.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-const-ref.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-const-ref.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-const-ref.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-trivially-copyable.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-trivially-copyable.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg-trivially-copyable.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg-trivially-copyable.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-move-const-arg.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/move-const-arg.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-move-constructor-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-move-constructor-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp
index 95615ff6e1d9b..2dff4a68b8193 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/performance-move-constructor-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance/move-constructor-init.cpp
@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s performance-move-constructor-init,modernize-pass-by-value %t -- \
 // RUN: -config='{CheckOptions: \
 // RUN:  [{key: modernize-pass-by-value.ValuesOnly, value: true}]}' \
-// RUN: -- -isystem %S/Inputs/Headers
+// RUN: -- -isystem %clang_tidy_headers
 
 #include <s.h>
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-no-automatic-move.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/no-automatic-move.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-no-automatic-move.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/no-automatic-move.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-no-int-to-ptr.c b/clang-tools-extra/test/clang-tidy/checkers/performance/no-int-to-ptr.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-no-int-to-ptr.c
rename to clang-tools-extra/test/clang-tidy/checkers/performance/no-int-to-ptr.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-no-int-to-ptr.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/no-int-to-ptr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-no-int-to-ptr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/no-int-to-ptr.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor-fix.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/noexcept-move-constructor-fix.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor-fix.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/noexcept-move-constructor-fix.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/noexcept-move-constructor.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-noexcept-move-constructor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/noexcept-move-constructor.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-trivially-destructible.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-trivially-destructible.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-type-promotion-in-math-fn.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/type-promotion-in-math-fn.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-type-promotion-in-math-fn.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/type-promotion-in-math-fn.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-allowed-types.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-allowed-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-allowed-types.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-excluded-container-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-excluded-container-types.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization-excluded-container-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization-excluded-container-types.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-copy-initialization.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-copy-initialization.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-allowed-types.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-allowed-types.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-allowed-types.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-allowed-types.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.m b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-arc.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.m
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-arc.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.mm b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-arc.mm
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-arc.mm
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-arc.mm

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-delayed.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-delayed.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-delayed.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-delayed.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-header.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-header.cpp
similarity index 85%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-header.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-header.cpp
index 64c6ec70ac997..2b45bb719dbc5 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-header.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-header.cpp
@@ -1,8 +1,8 @@
 // RUN: rm -rf %t
 // RUN: mkdir %t
-// RUN: cp %S/Inputs/performance-unnecessary-value-param/header.h %t/header.h
+// RUN: cp %S/Inputs/unnecessary-value-param/header.h %t/header.h
 // RUN: %check_clang_tidy %s performance-unnecessary-value-param %t/temp -- -- -I %t
-// RUN: 
diff  %t/header.h %S/Inputs/performance-unnecessary-value-param/header-fixed.h
+// RUN: 
diff  %t/header.h %S/Inputs/unnecessary-value-param/header-fixed.h
 
 #include "header.h"
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-incomplete-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-incomplete-type.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param-incomplete-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param-incomplete-type.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/performance-unnecessary-value-param.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/performance/unnecessary-value-param.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/float.h b/clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/float.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/float.h
rename to clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/float.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/r.h b/clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/r.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/r.h
rename to clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/r.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/s.h b/clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/s.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/s.h
rename to clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/s.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/stddef.h b/clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/stddef.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/stddef.h
rename to clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/stddef.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/stdint.h b/clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/stdint.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/stdint.h
rename to clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/stdint.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/t.h b/clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/t.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/t.h
rename to clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/t.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/transitive.h b/clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/transitive.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/system/transitive.h
rename to clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/system/transitive.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/transitive2.h b/clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/transitive2.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/portability-restrict-system-includes/transitive2.h
rename to clang-tools-extra/test/clang-tidy/checkers/portability/Inputs/restrict-system-includes/transitive2.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-allow.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-allow.cpp
similarity index 83%
rename from clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-allow.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-allow.cpp
index a74b94b604ac1..37a422bb706f8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-allow.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-allow.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s portability-restrict-system-includes %t \
 // RUN:     -- -config="{CheckOptions: [{key: portability-restrict-system-includes.Includes, value: '*,-stddef.h'}]}" \
-// RUN:     -- -isystem %S/Inputs/portability-restrict-system-includes/system
+// RUN:     -- -isystem %S/Inputs/restrict-system-includes/system
 
 // Test block-list functionality: allow all but stddef.h.
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-disallow.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-disallow.cpp
similarity index 85%
rename from clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-disallow.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-disallow.cpp
index 1d1e8a4e6706e..f84301826c481 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-disallow.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-disallow.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s portability-restrict-system-includes %t \
 // RUN:     -- -config="{CheckOptions: [{key: portability-restrict-system-includes.Includes, value: '-*,stddef.h'}]}" \
-// RUN:     -- -isystem %S/Inputs/portability-restrict-system-includes/system
+// RUN:     -- -isystem %S/Inputs/restrict-system-includes/system
 
 // Test allow-list functionality: disallow all but stddef.h.
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-glob.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-glob.cpp
similarity index 84%
rename from clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-glob.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-glob.cpp
index e1cd5888e02a6..5d5c0a1a41cc9 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-glob.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-glob.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s portability-restrict-system-includes %t \
 // RUN:     -- -config="{CheckOptions: [{key: portability-restrict-system-includes.Includes, value: '-*,std*.h'}]}" \
-// RUN:     -- -isystem %S/Inputs/portability-restrict-system-includes/system
+// RUN:     -- -isystem %S/Inputs/restrict-system-includes/system
 
 // Test glob functionality: disallow all headers except those that match
 // pattern "std*.h".

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-transitive.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-transitive.cpp
similarity index 91%
rename from clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-transitive.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-transitive.cpp
index 0f68da31cd455..eaabfc6d3eb04 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/portability-restrict-system-includes-transitive.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/portability/restrict-system-includes-transitive.cpp
@@ -1,6 +1,6 @@
 // RUN: rm -rf %T/Headers
 // RUN: mkdir %T/Headers
-// RUN: cp -r %S/Inputs/portability-restrict-system-includes %T/Headers/portability-restrict-system-includes
+// RUN: cp -r %S/Inputs/restrict-system-includes %T/Headers/portability-restrict-system-includes
 // RUN: %check_clang_tidy -std=c++11 %s portability-restrict-system-includes %t \
 // RUN:   -- -config="{CheckOptions: [{key: portability-restrict-system-includes.Includes, value: 'transitive.h,s.h'}]}" \
 // RUN:   -system-headers -header-filter=.* \

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-ppc.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-ppc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-ppc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-ppc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-x86.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-x86.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/portability-simd-intrinsics-x86.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability/simd-intrinsics-x86.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/portability-std-allocator-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/portability/std-allocator-const.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/portability-std-allocator-const.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/portability/std-allocator-const.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/duplicate-include.h
similarity index 64%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/duplicate-include.h
index 7d84adb816622..bf288023274b1 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include.h
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/duplicate-include.h
@@ -2,13 +2,13 @@
 #define READABILITY_DUPLICATE_INCLUDE_H
 
 extern int g;
-#include "readability-duplicate-include2.h"
+#include "duplicate-include2.h"
 extern int h;
-#include "readability-duplicate-include2.h"
+#include "duplicate-include2.h"
 extern int i;
 // CHECK-MESSAGES: :[[@LINE-2]]:1: warning: duplicate include
 // CHECK-FIXES:      {{^extern int g;$}}
-// CHECK-FIXES-NEXT: {{^#include "readability-duplicate-include2.h"$}}
+// CHECK-FIXES-NEXT: {{^#include "duplicate-include2.h"$}}
 // CHECK-FIXES-NEXT: {{^extern int h;$}}
 // CHECK-FIXES-NEXT: {{^extern int i;$}}
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include2.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/duplicate-include2.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/readability-duplicate-include2.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/duplicate-include2.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/iostream b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/iostream
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/iostream
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/iostream

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/string.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/string.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/string.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/string.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/sys/types.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/sys/types.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/sys/types.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/sys/types.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/types.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/types.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-duplicate-include/system/types.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/system/types.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style1/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/.clang-tidy
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style1/.clang-tidy
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/.clang-tidy

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style1/header.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/header.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style1/header.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style1/header.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style2/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/.clang-tidy
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style2/.clang-tidy
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/.clang-tidy

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style2/header.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/header.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/global-style2/header.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/global-style2/header.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/hungarian-notation1/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation1/.clang-tidy
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/hungarian-notation1/.clang-tidy
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation1/.clang-tidy

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/hungarian-notation2/.clang-tidy b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/hungarian-notation2/.clang-tidy
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/hungarian-notation2/.clang-tidy

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/coroutines.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/system/coroutines.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/coroutines.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/system/coroutines.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/system-header.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/system/system-header.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/system/system-header.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/system/system-header.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/user-header.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/user-header.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-identifier-naming/user-header.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/identifier-naming/user-header.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-static-accessed-through-instance/__clang_cuda_builtin_vars.h b/clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/static-accessed-through-instance/__clang_cuda_builtin_vars.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/Inputs/readability-static-accessed-through-instance/__clang_cuda_builtin_vars.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/static-accessed-through-instance/__clang_cuda_builtin_vars.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-avoid-const-params-in-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/avoid-const-params-in-decls.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-avoid-const-params-in-decls.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/avoid-const-params-in-decls.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-avoid-underscore-in-googletest-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/avoid-underscore-in-googletest-name.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-avoid-underscore-in-googletest-name.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/avoid-underscore-in-googletest-name.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-assert-failure.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-assert-failure.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-assert-failure.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-assert-failure.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-attributes.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-attributes.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-attributes.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-attributes.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-constexpr-if-templates.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-constexpr-if-templates.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-constexpr-if-templates.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-constexpr-if-templates.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-few-lines.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-few-lines.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-few-lines.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-few-lines.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-format.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-format.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-format.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-format.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-same-line.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-same-line.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-same-line.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-same-line.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-single-line.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-single-line.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements-single-line.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-single-line.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-braces-around-statements.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-container-contains.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/container-contains.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-container-contains.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/container-contains.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-container-data-pointer.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-container-data-pointer.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty-cxx20.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty-cxx20.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty-cxx20.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty-cxx20.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-container-size-empty.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-convert-member-functions-to-static.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-convert-member-functions-to-static.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-delete-null-pointer.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/delete-null-pointer.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-delete-null-pointer.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/delete-null-pointer.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-duplicate-include.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/duplicate-include.cpp
similarity index 87%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-duplicate-include.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/duplicate-include.cpp
index f9a3c70ef86f4..dd954c705514f 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-duplicate-include.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/duplicate-include.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s readability-duplicate-include %t -- -- -isystem %S/Inputs/readability-duplicate-include/system -I %S/Inputs/readability-duplicate-include
+// RUN: %check_clang_tidy %s readability-duplicate-include %t -- -- -isystem %S/Inputs/duplicate-include/system -I %S/Inputs/duplicate-include
 
 int a;
 #include <string.h>
@@ -23,13 +23,13 @@ int f;
 // CHECK-FIXES-NEXT: {{^int f;$}}
 
 int g;
-#include "readability-duplicate-include.h"
+#include "duplicate-include.h"
 int h;
-#include "readability-duplicate-include.h"
+#include "duplicate-include.h"
 int i;
 // CHECK-MESSAGES: :[[@LINE-2]]:1: warning: duplicate include
 // CHECK-FIXES:      {{^int g;$}}
-// CHECK-FIXES-NEXT: {{^#include "readability-duplicate-include.h"$}}
+// CHECK-FIXES-NEXT: {{^#include "duplicate-include.h"$}}
 // CHECK-FIXES-NEXT: {{^int h;$}}
 // CHECK-FIXES-NEXT: {{^int i;$}}
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-if-constexpr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-if-constexpr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-if-constexpr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-if-constexpr.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-no-cond-var-refactor.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-cond-var-refactor.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-no-cond-var-refactor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-cond-var-refactor.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-no-warn.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-warn.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-no-warn.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-no-warn.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-pp-no-crash.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-pp-no-crash.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return-pp-no-crash.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return-pp-no-crash.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/else-after-return.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity-flags.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity-flags.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity-flags.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity-flags.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-function-cognitive-complexity.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/function-cognitive-complexity.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-function-size-variables-c++17.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/function-size-variables-c++17.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-function-size-variables-c++17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/function-size-variables-c++17.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-function-size.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/function-size.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-function-size.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/function-size.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-length.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-length.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-length.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-length.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix-name-conflicts.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix-name-conflicts.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix-name-conflicts.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix-name-conflicts.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-bugfix.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-bugfix.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-case-violation.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-case-violation.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-case-violation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-case-violation.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-hungarian-notation-cfgfile.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-hungarian-notation-cfgfile.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp
index c8b07690941a7..60a4d9b7464c1 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-hungarian-notation-cfgfile.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-tidy %s --config-file=%S/Inputs/readability-identifier-naming/hungarian-notation1/.clang-tidy 2>&1 \
+// RUN: clang-tidy %s --config-file=%S/Inputs/identifier-naming/hungarian-notation1/.clang-tidy 2>&1 \
 // RUN:   | FileCheck -check-prefixes=CHECK-MESSAGES %s
 
 // clang-format off

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-hungarian-notation.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-hungarian-notation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp
index b6873a182039b..18a39b15b0c5e 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-hungarian-notation.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-tidy %s --config-file=%S/Inputs/readability-identifier-naming/hungarian-notation2/.clang-tidy 2>&1 \
+// RUN: clang-tidy %s --config-file=%S/Inputs/identifier-naming/hungarian-notation2/.clang-tidy 2>&1 \
 // RUN:   | FileCheck -check-prefixes=CHECK-MESSAGES %s
 
 // clang-format off

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-ignored-regexp.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-ignored-regexp.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-ignored-regexp.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-ignored-regexp.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-main-like.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-main-like.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-main-like.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-main-like.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-member-decl-usage.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-member-decl-usage.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-member-decl-usage.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-member-decl-usage.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-multiple-styles.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-multiple-styles.cpp
similarity index 96%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-multiple-styles.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-multiple-styles.cpp
index 0608305a82250..756838c553cde 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-multiple-styles.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-multiple-styles.cpp
@@ -2,7 +2,7 @@
 
 // RUN: rm -rf %theaders
 // RUN: mkdir %theaders
-// RUN: cp -R %S/Inputs/readability-identifier-naming/. %theaders
+// RUN: cp -R %S/Inputs/identifier-naming/. %theaders
 
 // C++11 isn't explicitly required, but failing to specify a standard means the
 // check will run multiple times for 
diff erent standards. This will cause the
@@ -19,7 +19,7 @@
 
 // On DISABLED run, everything should be made 'camelBack'.
 
-// RUN: cp -R %S/Inputs/readability-identifier-naming/. %theaders
+// RUN: cp -R %S/Inputs/identifier-naming/. %theaders
 // RUN: %check_clang_tidy -check-suffixes=DISABLED,SHARED -std=c++11 %s \
 // RUN: readability-identifier-naming %t -- \
 // RUN:  -config='{ InheritParentConfig: false, CheckOptions: [ \

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-objc.m b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-objc.m
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming-objc.m
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-objc.m

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp
index 01bcb34eadc0d..08287e9b51e41 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp
@@ -82,8 +82,8 @@
 // RUN:     {key: readability-identifier-naming.LocalConstantPointerCase, value: CamelCase}, \
 // RUN:     {key: readability-identifier-naming.LocalConstantPointerPrefix, value: 'lc_'}, \
 // RUN:   ]}' -- -fno-delayed-template-parsing -Dbad_macro -std=c++17 -fcoroutines-ts \
-// RUN:   -I%S/Inputs/readability-identifier-naming \
-// RUN:   -isystem %S/Inputs/readability-identifier-naming/system
+// RUN:   -I%S/Inputs/identifier-naming \
+// RUN:   -isystem %S/Inputs/identifier-naming/system
 
 // clang-format off
 

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-allow-in-conditions.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-allow-in-conditions.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-allow-in-conditions.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-allow-in-conditions.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-cxx98.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-cxx98.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion-cxx98.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion-cxx98.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-implicit-bool-conversion.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/implicit-bool-conversion.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-strict.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-strict.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name-strict.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name-strict.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-inconsistent-declaration-parameter-name.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-declaration-parameter-name.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-cxx17.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-cxx17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-cxx17.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-fixing.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-fixing.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-fixing.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-fixing.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-no-infinite-loop.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-no-infinite-loop.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration-no-infinite-loop.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration-no-infinite-loop.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.c b/clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.c
rename to clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-isolate-declaration.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/isolate-declaration.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-bitfields.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-bitfields.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-bitfields.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-bitfields.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-todo.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-todo.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-todo.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-todo.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-userliteral.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-userliteral.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-userliteral.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-userliteral.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-make-member-function-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/make-member-function-const.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-make-member-function-const.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/make-member-function-const.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-misleading-indentation.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/misleading-indentation.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-misleading-indentation.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/misleading-indentation.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-misplaced-array-index.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/misplaced-array-index.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-misplaced-array-index.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/misplaced-array-index.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-named-parameter.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/named-parameter.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-named-parameter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/named-parameter.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-non-const-parameter.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/non-const-parameter.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-non-const-parameter.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/non-const-parameter.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-qualified-auto-cxx20.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/qualified-auto-cxx20.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-qualified-auto-cxx20.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/qualified-auto-cxx20.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-qualified-auto.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/qualified-auto.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-qualified-auto.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/qualified-auto.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers-check-first-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers-check-first-declaration.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers-check-first-declaration.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers-check-first-declaration.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-access-specifiers.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-control-flow.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-control-flow.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-control-flow.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-control-flow.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration-ignore-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration-ignore-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration-ignore-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration-ignore-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.c b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.c
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.c

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-declaration.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-declaration.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-function-ptr-dereference.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-function-ptr-dereference.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-function-ptr-dereference.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-function-ptr-dereference.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-member-init.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-member-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-member-init.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor-ifdef.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor-ifdef.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor-ifdef.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor-ifdef.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor.cpp
similarity index 97%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor.cpp
index 6cffd8f43899f..5429898e7ccd7 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor.cpp
@@ -19,7 +19,7 @@ void f2();
 #endif
 
 // Negative testing.
-#include "readability-redundant-preprocessor.h"
+#include "redundant-preprocessor.h"
 
 #ifndef BAR
 void g();

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.h b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-preprocessor.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-preprocessor.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-macros.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-macros.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-macros.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-msvc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get-msvc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get-msvc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-smartptr-get.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-smartptr-get.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-msvc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr-msvc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-msvc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-cstr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init-msvc.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init-msvc.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-init.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-case.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-case.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-case.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-case.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-assignment.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-chained-conditional-assignment.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-assignment.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-chained-conditional-assignment.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-chained-conditional-return.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-chained-conditional-return.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-chained-conditional-return.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-cxx17.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-cxx17.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-cxx17.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-cxx17.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-demorgan.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-demorgan.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-demorgan.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-demorgan.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-members.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-members.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr-members.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-members.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-simplify-bool-expr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-simplify-subscript-expr.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/simplify-subscript-expr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-simplify-subscript-expr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/simplify-subscript-expr.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance-nesting-threshold.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance-nesting-threshold.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance-nesting-threshold.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance-nesting-threshold.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance.cpp
index debf3b9222164..5b1265dcc3552 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-static-accessed-through-instance.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s readability-static-accessed-through-instance %t -- -- -isystem %S/Inputs/readability-static-accessed-through-instance
+// RUN: %check_clang_tidy %s readability-static-accessed-through-instance %t -- -- -isystem %S/Inputs/static-accessed-through-instance
 #include <__clang_cuda_builtin_vars.h>
 
 struct C {

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-static-definition-in-anonymous-namespace.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/static-definition-in-anonymous-namespace.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-static-definition-in-anonymous-namespace.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/static-definition-in-anonymous-namespace.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-string-compare.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/string-compare.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-string-compare.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/string-compare.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-suspicious-call-argument.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/suspicious-call-argument.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-suspicious-call-argument.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/suspicious-call-argument.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uniqueptr-delete-release.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uniqueptr-delete-release.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uniqueptr-delete-release.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uniqueptr-delete-release.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-float16.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-float16.cpp
similarity index 97%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-float16.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-float16.cpp
index b2b858f9345b5..89c10488069e4 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-float16.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-float16.cpp
@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s readability-uppercase-literal-suffix %t -- -- -target aarch64-linux-gnu -I %S
 
-#include "readability-uppercase-literal-suffix.h"
+#include "uppercase-literal-suffix.h"
 
 void float16_normal_literals() {
   // _Float16

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-floating-point-opencl-half.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point-opencl-half.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-floating-point-opencl-half.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-floating-point.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-floating-point.cpp
index 50e75fae6ae40..27e4bd8e21441 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-floating-point.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-floating-point.cpp
@@ -3,7 +3,7 @@
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -fix -- -target x86_64-pc-linux-gnu -I %S
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -warnings-as-errors='-*,readability-uppercase-literal-suffix' -- -target x86_64-pc-linux-gnu -I %S
 
-#include "readability-uppercase-literal-suffix.h"
+#include "uppercase-literal-suffix.h"
 
 void floating_point_suffix() {
   static constexpr auto v0 = 1.; // no literal

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-hexadecimal-floating-point.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-hexadecimal-floating-point.cpp
index 415c6d8e7915f..9f60abe740af7 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-hexadecimal-floating-point.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-hexadecimal-floating-point.cpp
@@ -3,7 +3,7 @@
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -fix -- -target x86_64-pc-linux-gnu -I %S
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -warnings-as-errors='-*,readability-uppercase-literal-suffix' -- -target x86_64-pc-linux-gnu -I %S
 
-#include "readability-uppercase-literal-suffix.h"
+#include "uppercase-literal-suffix.h"
 
 void floating_point_suffix() {
   static constexpr auto v0 = 0x0p0; // no literal

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-custom-list.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-custom-list.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp
index ff67a336b25ea..9e83ce2c94f0d 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-custom-list.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-custom-list.cpp
@@ -3,7 +3,7 @@
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -fix -config="{CheckOptions: [{key: readability-uppercase-literal-suffix.NewSuffixes, value: 'L;uL'}]}" -- -I %S
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -warnings-as-errors='-*,readability-uppercase-literal-suffix' -config="{CheckOptions: [{key: readability-uppercase-literal-suffix.NewSuffixes, value: 'L;uL'}]}" -- -I %S
 
-#include "readability-uppercase-literal-suffix.h"
+#include "uppercase-literal-suffix.h"
 
 void integer_suffix() {
   // Unsigned

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-macro.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-macro.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-macro.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-macro.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-ms.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-ms.cpp
similarity index 98%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-ms.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-ms.cpp
index 1ec3211e58d79..fb8dd23a53651 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer-ms.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer-ms.cpp
@@ -3,7 +3,7 @@
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -fix -- -target x86_64-pc-linux-gnu -I %S -fms-extensions
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -warnings-as-errors='-*,readability-uppercase-literal-suffix' -- -target x86_64-pc-linux-gnu -I %S -fms-extensions
 
-#include "readability-uppercase-literal-suffix.h"
+#include "uppercase-literal-suffix.h"
 
 void integer_suffix() {
   static constexpr auto v0 = __LINE__; // synthetic

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer.cpp
similarity index 99%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer.cpp
index 847501f098f4a..f4fdf29f1d73b 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix-integer.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix-integer.cpp
@@ -3,7 +3,7 @@
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -fix -- -I %S
 // RUN: clang-tidy %t.cpp -checks='-*,readability-uppercase-literal-suffix' -warnings-as-errors='-*,readability-uppercase-literal-suffix' -- -I %S
 
-#include "readability-uppercase-literal-suffix.h"
+#include "uppercase-literal-suffix.h"
 
 void integer_suffix() {
   static constexpr auto v0 = __LINE__; // synthetic

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix.h b/clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-uppercase-literal-suffix.h
rename to clang-tools-extra/test/clang-tidy/checkers/readability/uppercase-literal-suffix.h

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-use-anyofallof-cpp20.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/use-anyofallof-cpp20.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-use-anyofallof-cpp20.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/use-anyofallof-cpp20.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/readability-use-anyofallof.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/use-anyofallof.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/readability-use-anyofallof.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability/use-anyofallof.cpp

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/zircon-temporary-objects.cpp b/clang-tools-extra/test/clang-tidy/checkers/zircon/temporary-objects.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/zircon-temporary-objects.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/zircon/temporary-objects.cpp

diff  --git a/clang-tools-extra/test/lit.cfg.py b/clang-tools-extra/test/lit.cfg.py
index f8fdfbd0a9205..9b99bfd93440f 100644
--- a/clang-tools-extra/test/lit.cfg.py
+++ b/clang-tools-extra/test/lit.cfg.py
@@ -51,6 +51,10 @@
 config.substitutions.append(
     ('%run_clang_tidy',
      '%s %s' % (python_exec, run_clang_tidy)) )
+clang_tidy_headers = os.path.join(
+    config.test_source_root, "clang-tidy", "checkers", "Inputs", "Headers")
+config.substitutions.append(
+    ("%clang_tidy_headers", clang_tidy_headers) )
 
 # Plugins (loadable modules)
 if config.has_plugins and config.llvm_plugin_ext: