Skip to content

Commit 410745e

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Fix test failures
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent fe7266e commit 410745e

File tree

13 files changed

+72
-73
lines changed

13 files changed

+72
-73
lines changed

‎src/licensedcode/data/licenses/flex-2.5.LICENSE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ other_spdx_license_keys:
1111
text_urls:
1212
- http://www.cs.cmu.edu/afs/cs/project/ai-repository-9/ai/areas/nlp/parsing/flex/copying.txt
1313
minimum_coverage: 80
14-
ignorable_authors:
15-
- the University of California, Berkeley and its contributors
1614
---
1715

1816
The United States Government has rights in this work pursuant

‎tests/licensedcode/data/datadriven/external/licensecheck/fedora/MIT.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ license_expressions:
3838
- other-permissive
3939
- unixcrypt
4040
- isc
41-
- osf-1990
41+
- hp-1986
4242
- other-permissive

‎tests/licensedcode/data/datadriven/external/slic-tests/z2ram.c.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
license_expressions:
2-
- libpbm
2+
- hpnd-pbmplus
33
- gpl-2.0-plus

‎tests/licensedcode/data/datadriven/lic2/newlib/newlib_license.txt.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license_expressions:
66
- standard-ml-nj
77
- amd-historical
88
- sunpro
9-
- osf-1990
9+
- hp-1986
1010
- nilsson-historical
1111
- newlib-historical
1212
- bsd-new
@@ -23,7 +23,7 @@ license_expressions:
2323
- lgpl-2.0-plus
2424
- lgpl-2.0-plus
2525
- intel-osl-1993
26-
- osf-1990
26+
- hp-1986
2727
- hs-regexp
2828
- bsd-simplified
2929
- bsd-simplified

‎tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_24.txt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
license_expressions:
2-
- osf-1990
2+
- hp-1986

‎tests/licensedcode/data/datadriven/lic2/newlib/newlib_license_8.txt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
license_expressions:
2-
- osf-1990
2+
- hp-1986

‎tests/licensedcode/data/datadriven/lic3/mit_variants_and_gpl-2.0-plus.txt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
license_expressions:
22
- mit-xfig
3-
- libpbm
3+
- hpnd-pbmplus
44
- mit-old-style-no-advert
55
- gpl-2.0-plus

‎tests/packagedcode/data/alpine/licenses/alp-3.14-main-perl-data-uuid.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
declared_license: osf-1990(variant)
2-
license_expression: unknown
2+
license_expression: osf-1990

‎tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ other_license_expression: (public-domain AND us-govt-public-domain) AND boost-1.
3030
AND (public-domain AND us-govt-public-domain)
3131
other_license_expression_spdx: (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain)
3232
AND BSL-1.0 AND (HPND-export-US-modify AND LicenseRef-scancode-proprietary-license) AND LicenseRef-scancode-public-domain
33-
AND LicenseRef-scancode-flex-2.5 AND LicenseRef-scancode-flex-2.5 AND LicenseRef-scancode-flex-2.5
34-
AND LicenseRef-scancode-flex-2.5 AND LicenseRef-scancode-flex-2.5 AND MIT AND (GPL-2.0-or-later
35-
AND GPL-2.0-or-later) AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND (LicenseRef-scancode-public-domain
36-
AND LicenseRef-scancode-us-govt-public-domain) AND (LicenseRef-scancode-public-domain AND
37-
LicenseRef-scancode-us-govt-public-domain) AND (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain)
33+
AND BSD-3-Clause-flex AND BSD-3-Clause-flex AND BSD-3-Clause-flex AND BSD-3-Clause-flex AND
34+
BSD-3-Clause-flex AND MIT AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-2.0-or-later
35+
AND GPL-2.0-or-later) AND (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain)
36+
AND (LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain) AND
37+
(LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain)
3838
license_detections: []
3939
other_license_detections:
4040
- license_expression: public-domain AND us-govt-public-domain

‎tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
11
declared_license:
22
declared_license_expression: lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND sun-source
3-
AND libpbm AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND gpl-2.0-plus
4-
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND adrian AND lgpl-2.1-plus
3+
AND hpnd-pbmplus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND
4+
gpl-2.0-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND adrian
55
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
66
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
77
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
8-
AND lgpl-2.1-plus AND mit AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
9-
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.0-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
8+
AND lgpl-2.1-plus AND lgpl-2.1-plus AND mit AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
9+
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.0-plus AND lgpl-2.1-plus
1010
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
1111
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
1212
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
1313
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
14-
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND gpl-2.0-plus AND lgpl-2.1-plus AND
15-
lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
14+
AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND gpl-2.0-plus AND
15+
lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus AND lgpl-2.1-plus
1616
declared_license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
17-
AND LicenseRef-scancode-sun-source AND xlock AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND
18-
LGPL-2.1-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
19-
AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LicenseRef-scancode-adrian AND LGPL-2.1-or-later
17+
AND LicenseRef-scancode-sun-source AND HPND-Pbmplus AND LGPL-2.1-or-later AND LGPL-2.1-or-later
18+
AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND
19+
LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LicenseRef-scancode-adrian
2020
AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND
2121
LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
2222
AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND
23-
LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND MIT AND LGPL-2.1-or-later
23+
LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND MIT
2424
AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND
25-
LGPL-2.1-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
25+
LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
2626
AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND
2727
LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
2828
AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND
2929
LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
3030
AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND
31-
GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
31+
LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
32+
AND LGPL-2.1-or-later
3233
other_license_expression:
3334
other_license_expression_spdx:
3435
license_detections:
@@ -119,26 +120,26 @@ license_detections:
119120
or profits or other special, indirect and consequential damages, even if
120121
Sun has been advised of the possibility of such damages.
121122
identifier: sun_source-02813787-7782-d45a-b30b-598566f2f032
122-
- license_expression: libpbm
123+
- license_expression: hpnd-pbmplus
123124
matches:
124125
- score: '100.0'
125126
start_line: 68
126127
end_line: 73
127128
matched_length: 56
128129
match_coverage: '100.0'
129130
matcher: 2-aho
130-
license_expression: libpbm
131-
rule_identifier: libpbm.LICENSE
131+
license_expression: hpnd-pbmplus
132+
rule_identifier: hpnd-pbmplus.LICENSE
132133
rule_relevance: 100
133-
rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/libpbm.LICENSE
134+
rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-pbmplus.LICENSE
134135
matched_text: |
135136
Permission to use, copy, modify, and distribute this software and its
136137
documentation for any purpose and without fee is hereby granted, provided
137138
that the above copyright notice appear in all copies and that both that
138139
copyright notice and this permission notice appear in supporting
139140
documentation. This software is provided "as is" without express or
140141
implied warranty.
141-
identifier: libpbm-285aa0f9-c4e9-26cb-7e01-29594fbc0842
142+
identifier: hpnd_pbmplus-791a84f8-2595-c6f9-929c-722baf14af4e
142143
- license_expression: lgpl-2.1-plus
143144
matches:
144145
- score: '100.0'

0 commit comments

Comments
 (0)