Skip to content

Commit a873838

Browse files
committed
badwords: fix issues found in tests
There remain some false positives, hits in test data, and `dir` use, around 100 issues in total. There is no plan to enforce badwords on tests. Also: - badwords.txt: let a few `manpage[s]` occurrences through (in Perl code). Closes curl#19541
1 parent f0de141 commit a873838

247 files changed

Lines changed: 594 additions & 595 deletions

File tree

Some content is hidden

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

.github/scripts/badwords.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@ file names\b:filenames
7575
---WWW::Curl
7676
---NET::Curl
7777
---Curl Corporation
78-
\bmanpages[^./&:-]:man pages
79-
\bmanpage[^si./&:-]:man page
78+
\bmanpages[^./;=&{:-]:man pages
79+
\bmanpage[^si./;=&{:-]:man page

tests/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ EXTRA_DIST = \
8484
valgrind.supp \
8585
$(TESTSCRIPTS)
8686

87-
# we have two variables here to make sure DIST_SUBDIRS won't get 'unit'
87+
# we have two variables here to make sure DIST_SUBDIRS does not get 'unit'
8888
# added twice as then targets such as 'distclean' misbehave and try to
8989
# do things twice in that subdir at times (and thus fails).
9090
if BUILD_UNITTESTS
@@ -108,7 +108,7 @@ curl:
108108
TEST_COMMON =
109109

110110
if CROSSCOMPILING
111-
TEST = @echo "NOTICE: we can't run the tests when cross-compiling!"
111+
TEST = @echo "NOTICE: we cannot run the tests when cross-compiling!"
112112
PYTEST = $(TEST)
113113
else # if not cross-compiling:
114114

@@ -124,8 +124,8 @@ TEST_F = -a -w -p -r
124124
TEST_T = -a -w -t -j20
125125
TEST_E = -a -w -e
126126

127-
# ~<keyword> means that it will run all tests matching the keyword, but will
128-
# ignore their results (since these ones are likely to fail for no good reason)
127+
# ~<keyword> means that it runs all tests matching the keyword, but ignores
128+
# their results (since these ones are likely to fail for no good reason)
129129
TEST_NF = -a -w -p ~flaky ~timing-dependent
130130

131131
# special target for CI use

tests/allversions.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ our %pastversion;
3333
sub allversions {
3434
my ($file) = @_;
3535
open(A, "<$file") ||
36-
die "can't open the versions file $file\n";
36+
die "cannot open the versions file $file\n";
3737
my $before = 1;
3838
my $relcount;
3939
while(<A>) {

tests/certs/genserv.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ sub opensslfail {
5555
} elsif(! -f "$CAPREFIX-ca.cacert" ||
5656
! -f "$CAPREFIX-ca.key") {
5757

58-
if($OPENSSL eq basename($OPENSSL)) { # has no dir component
58+
if($OPENSSL eq basename($OPENSSL)) { # has no directory component
5959
# find openssl in PATH
6060
my $found = 0;
6161
foreach(File::Spec->path()) {

tests/certs/test-ca.prm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ string_mask = utf8only
2727
countryName = "Country Name"
2828
countryName_value = NN
2929
organizationName = "Organization Name"
30-
organizationName_value = Edel Curl Arctic Illudium Research Cloud
30+
organizationName_value = Edel curl Arctic Illudium Research Cloud
3131
commonName = "Common Name"
3232
commonName_value = Northern Nowhere Trust Anchor

tests/certs/test-client-cert.prm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ string_mask = utf8only
2929
countryName = "Country Name is Northern Nowhere"
3030
countryName_value = NN
3131
organizationName = "Organization Name"
32-
organizationName_value = Edel Curl Arctic Illudium Research Cloud
32+
organizationName_value = Edel curl Arctic Illudium Research Cloud
3333
commonName = "Common Name"
3434
commonName_value = localhost

tests/certs/test-client-eku-only.prm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ string_mask = utf8only
2929
countryName = "Country Name is Northern Nowhere"
3030
countryName_value = NN
3131
organizationName = "Organization Name"
32-
organizationName_value = Edel Curl Arctic Illudium Research Cloud
32+
organizationName_value = Edel curl Arctic Illudium Research Cloud
3333
commonName = "Common Name"
3434
commonName_value = localhost

tests/certs/test-localhost-san-first.prm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ string_mask = utf8only
2929
countryName = "Country Name is Northern Nowhere"
3030
countryName_value = NN
3131
organizationName = "Organization Name"
32-
organizationName_value = Edel Curl Arctic Illudium Research Cloud
32+
organizationName_value = Edel curl Arctic Illudium Research Cloud
3333
commonName = "Common Name"
3434
commonName_value = localhost.nn

tests/certs/test-localhost-san-last.prm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ string_mask = utf8only
2929
countryName = "Country Name is Northern Nowhere"
3030
countryName_value = NN
3131
organizationName = "Organization Name"
32-
organizationName_value = Edel Curl Arctic Illudium Research Cloud
32+
organizationName_value = Edel curl Arctic Illudium Research Cloud
3333
commonName = "Common Name"
3434
commonName_value = localhost.nn

tests/certs/test-localhost.nn.prm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ string_mask = utf8only
2929
countryName = "Country Name is Northern Nowhere"
3030
countryName_value = NN
3131
organizationName = "Organization Name"
32-
organizationName_value = Edel Curl Arctic Illudium Research Cloud
32+
organizationName_value = Edel curl Arctic Illudium Research Cloud
3333
commonName = "Common Name"
3434
commonName_value = localhost.nn

0 commit comments

Comments
 (0)