summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-10-26 14:40:07 +0200
committerKai Koehne <kai.koehne@qt.io>2016-10-27 09:32:11 +0000
commitb8113e90e2a1d9ea38a478990a93615f432ac35b (patch)
tree335f979a5c0666670dfdcca1f977517a8b0ee8e2 /tests
parent56ac0c12ab5e7269e16bcc1248e4241302d91d09 (diff)
downloadqttools-b8113e90e2a1d9ea38a478990a93615f432ac35b.tar.gz
attributionscanner: Allow to specify multiple filesv5.8.0-beta1
So far 'Path' was used to specify a whole directory, or a single file. This introduces a separate 'Files' property, so that one can document that e.g. two specific files in a directory contain third party code. 'Files' should be relative to 'Path'. Change-Id: If4213d9a1b1ca706c49ed761027c6af86fbdc02a Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qtattributionsscanner/testdata/good/expected.json2
-rw-r--r--tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json1
-rw-r--r--tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json1
3 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qtattributionsscanner/testdata/good/expected.json b/tests/auto/qtattributionsscanner/testdata/good/expected.json
index ed6d94344..2a076d650 100644
--- a/tests/auto/qtattributionsscanner/testdata/good/expected.json
+++ b/tests/auto/qtattributionsscanner/testdata/good/expected.json
@@ -9,6 +9,7 @@
"LicenseId": "xxx",
"Name": "Complete",
"Path": "%{PWD}/complete",
+ "Files": "",
"QDocModule": "qtest",
"QtUsage": "Multi\nLine\nUsage",
"Version": "1.0",
@@ -24,6 +25,7 @@
"LicenseId": "",
"Name": "Minimal",
"Path": "%{PWD}/minimal",
+ "Files": "",
"QDocModule": "qtest",
"QtUsage": "Usage",
"Version": "",
diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json
index 0ee9ba07f..5ddb2d32d 100644
--- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json
+++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.json
@@ -9,6 +9,7 @@
"LicenseId": "",
"Name": "",
"Path": "%{PWD}",
+ "Files": "",
"QDocModule": "",
"QtUsage": "",
"Version": "",
diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json
index 7ce485b82..da2febe18 100644
--- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json
+++ b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.json
@@ -9,6 +9,7 @@
"LicenseId": "",
"Name": "Unknown",
"Path": "%{PWD}",
+ "Files": "",
"QDocModule": "qtest",
"QtUsage": "Usage",
"Version": "",