summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2024-01-16 09:06:00 +0100
committerPaul Wicking <paul.wicking@qt.io>2024-01-16 12:02:47 +0100
commit49541f9c34c52515b7ee08467f87f871f28bd8dc (patch)
tree018f35aad699add2178cb626cdb1a1157b56ab51
parent6fb0d2e1e6e64713d587f24f44d6c88f111ad755 (diff)
Exclude QDoc's testdata from license check
Since commit 926959d2fefae25c8089b8ce89e949b13af7092c in qttools.git, tests for QDoc reside in `qttools.git/src/qdoc/qdoc/tests/`. A new test, `tst_validateQdocOutputFiles`, is under development. This test includes a `testdata` subdirectory, in which documentation projects and their expected output will be added over time. These files should be exempt from the license header check. However, due to the location of the test, they don't match the patterns for exclusion in `tst_license.pl`. Exclude the new test's testdata directory from the license check, as the contents of this directory is expected to change frequently, and as these files cannot be subject to licensing. Also, update the related comment in the script, as a previous change invalidated its content. Task-number: QTBUG-119500 Change-Id: Iee63ec5e1a66ae8693f95ad7f33c5cd59452259b Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rwxr-xr-xtests/prebuild/license/tst_licenses.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/prebuild/license/tst_licenses.pl b/tests/prebuild/license/tst_licenses.pl
index 50cfe4a4..1f3dd225 100755
--- a/tests/prebuild/license/tst_licenses.pl
+++ b/tests/prebuild/license/tst_licenses.pl
@@ -112,8 +112,9 @@ my %excludedFiles = (
qr{^tools/qscxmlc/moc_patches/.*\.patch$},
],
'qttools' => [
- # Exclude QDoc's golden output in tests
+ # Exclude QDoc test data and third party dependencies
qr{^src/qdoc/qdoc/tests/generatedoutput/expected_output/},
+ qr{^src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/},
qr{^src/qdoc/qdoc/src/qdoc/clang/AST/QualTypeNames.h},
],
);