Skip to content

Commit 89a1d03

Browse files
[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
1 parent 130167e commit 89a1d03

File tree

693 files changed

+115
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

693 files changed

+115
-104
lines changed

clang-tools-extra/clang-tidy/add_new_check.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,9 @@ def add_release_notes(module_path, module, check_name):
278278
# Adds a test for the check.
279279
def write_test(module_path, module, check_name, test_extension):
280280
check_name_dashes = module + '-' + check_name
281-
filename = os.path.normpath(os.path.join(module_path, '../../test/clang-tidy/checkers',
282-
check_name_dashes + '.' + test_extension))
281+
filename = os.path.normpath(os.path.join(
282+
module_path, '..', '..', 'test', 'clang-tidy', 'checkers',
283+
module, check_name + '.' + test_extension))
283284
print('Creating %s...' % filename)
284285
with io.open(filename, 'w', encoding='utf8', newline='\n') as f:
285286
f.write("""// RUN: %%check_clang_tidy %%s %(check_name_dashes)s %%t

clang-tools-extra/docs/clang-tidy/Contributing.rst

Lines changed: 10 additions & 4 deletions

clang-tools-extra/test/clang-tidy/checkers/altera-kernel-name-restriction.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/altera/kernel-name-restriction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %check_clang_tidy %s altera-kernel-name-restriction %t -- -- -I%S/Inputs/altera-kernel-name-restriction
2-
// RUN: %check_clang_tidy -check-suffix=UPPERCASE %s altera-kernel-name-restriction %t -- -- -I%S/Inputs/altera-kernel-name-restriction/uppercase -DUPPERCASE
1+
// RUN: %check_clang_tidy %s altera-kernel-name-restriction %t -- -- -I%S/Inputs/kernel-name-restriction
2+
// RUN: %check_clang_tidy -check-suffix=UPPERCASE %s altera-kernel-name-restriction %t -- -- -I%S/Inputs/kernel-name-restriction/uppercase -DUPPERCASE
33

44
#ifdef UPPERCASE
55
// The warning should be triggered regardless of capitalization

clang-tools-extra/test/clang-tidy/checkers/bugprone-argument-comment.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy %s bugprone-argument-comment %t -- -- -I %S/Inputs/bugprone-argument-comment
1+
// RUN: %check_clang_tidy %s bugprone-argument-comment %t -- -- -I %S/Inputs/argument-comment
22

33
// FIXME: clang-tidy should provide a -verify mode to make writing these checks
44
// easier and more accurate.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
33

44
#include "not-null-terminated-result-c.h"
55

clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-before-safe.c renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: -config="{CheckOptions: \
33
// RUN: [{key: bugprone-not-null-terminated-result.WantToUseSafeFunctions, \
44
// RUN: value: true}]}" \
5-
// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
5+
// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
66

77
#include "not-null-terminated-result-c.h"
88

clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-cxx.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c++11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result
33

44
#include "not-null-terminated-result-cxx.h"
55

clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-other.c renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe-other.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
33

44
#include "not-null-terminated-result-c.h"
55

clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe.c renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-safe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
33

44
#include "not-null-terminated-result-c.h"
55

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
33

44
#include "not-null-terminated-result-c.h"
55

clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-strlen.c renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
33

44
// FIXME: Something wrong with the APInt un/signed conversion on Windows:
55
// in 'strncmp(str6, "string", 7);' it tries to inject '4294967302' as length.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
33

44
#include "not-null-terminated-result-c.h"
55

clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wcslen.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c++11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result
33

44
// FIXME: Something wrong with the APInt un/signed conversion on Windows:
55
// in 'wcsncmp(wcs6, L"string", 7);' it tries to inject '4294967302' as length.

clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wmemcpy-safe-cxx.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
2-
// RUN: -- -std=c++11 -I %S/Inputs/bugprone-not-null-terminated-result
2+
// RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result
33

44
#include "not-null-terminated-result-cxx.h"
55

clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier-invert.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// RUN: {key: bugprone-reserved-identifier.Invert, value: true}, \
44
// RUN: {key: bugprone-reserved-identifier.AllowedIdentifiers, value: std;reference_wrapper;ref;cref;type;get}, \
55
// RUN: ]}' -- \
6-
// RUN: -I%S/Inputs/bugprone-reserved-identifier \
7-
// RUN: -isystem %S/Inputs/bugprone-reserved-identifier/system
6+
// RUN: -I%S/Inputs/reserved-identifier \
7+
// RUN: -isystem %S/Inputs/reserved-identifier/system
88

99
namespace std {
1010

clang-tools-extra/test/clang-tidy/checkers/bugprone-reserved-identifier.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %check_clang_tidy %s bugprone-reserved-identifier %t -- -- \
2-
// RUN: -I%S/Inputs/bugprone-reserved-identifier \
3-
// RUN: -isystem %S/Inputs/bugprone-reserved-identifier/system
2+
// RUN: -I%S/Inputs/reserved-identifier \
3+
// RUN: -isystem %S/Inputs/reserved-identifier/system
44

55
// no warnings expected without -header-filter=
66
#include "user-header.h"

clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-minimal.c renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %check_clang_tidy %s bugprone-signal-handler %t \
22
// RUN: -config='{CheckOptions: \
33
// RUN: [{key: bugprone-signal-handler.AsyncSafeFunctionSet, value: "minimal"}]}' \
4-
// RUN: -- -isystem %S/Inputs/Headers
4+
// RUN: -- -isystem %clang_tidy_headers
55

66
#include "signal.h"
77
#include "stdlib.h"

clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler-posix.c renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %check_clang_tidy %s bugprone-signal-handler %t \
22
// RUN: -config='{CheckOptions: \
33
// RUN: [{key: bugprone-signal-handler.AsyncSafeFunctionSet, value: "POSIX"}]}' \
4-
// RUN: -- -isystem %S/Inputs/Headers
4+
// RUN: -- -isystem %clang_tidy_headers
55

66
#include "signal.h"
77
#include "stdlib.h"

clang-tools-extra/test/clang-tidy/checkers/bugprone-signal-handler.c renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy %s bugprone-signal-handler %t -- -- -isystem %S/Inputs/Headers
1+
// RUN: %check_clang_tidy %s bugprone-signal-handler %t -- -- -isystem %clang_tidy_headers
22

33
#include "signal.h"
44
#include "stdlib.h"

clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-include.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-include.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy %s bugprone-suspicious-include %t -- -- -isystem %S/Inputs/Headers -fmodules
1+
// RUN: %check_clang_tidy %s bugprone-suspicious-include %t -- -- -isystem %clang_tidy_headers -fmodules
22

33
// clang-format off
44

clang-tools-extra/test/clang-tidy/checkers/bugprone-unchecked-optional-access.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy %s bugprone-unchecked-optional-access %t -- -- -I %S/Inputs/
1+
// RUN: %check_clang_tidy %s bugprone-unchecked-optional-access %t -- -- -I %S/Inputs/unchecked-optional-access
22

33
#include "absl/types/optional.h"
44

clang-tools-extra/test/clang-tidy/checkers/cert-dcl58-cpp.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/cert/dcl58-cpp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy %s cert-dcl58-cpp %t -- -- -std=c++1z -I %S/Inputs/Headers
1+
// RUN: %check_clang_tidy %s cert-dcl58-cpp %t -- -- -std=c++1z -I %clang_tidy_headers
22

33
#include "system-header-simulation.h"
44

clang-tools-extra/test/clang-tidy/checkers/cert-uppercase-literal-suffix-integer.cpp renamed to clang-tools-extra/test/clang-tidy/checkers/cert/uppercase-literal-suffix-integer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: clang-tidy %t.cpp -checks='-*,cert-dcl16-c' -fix -- -I %S
44
// RUN: clang-tidy %t.cpp -checks='-*,cert-dcl16-c' -warnings-as-errors='-*,cert-dcl16-c' -- -I %S
55

6-
#include "readability-uppercase-literal-suffix.h"
6+
#include "../readability/uppercase-literal-suffix.h"
77

88
void integer_suffix() {
99
static constexpr auto v0 = __LINE__; // synthetic

0 commit comments

Comments
 (0)