summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2021-09-28 17:36:09 +0200
committerDaniel Stenberg <daniel@haxx.se>2021-09-30 17:50:48 +0200
commitffb634d4ef5378c5f8255577fb65df3de82c0396 (patch)
treef82d8cdb5888dc01743bcc0a98871c5e4b01f931 /tests
parentd10a0af2f3ba4ad7a3b9636b77cc81e1a9c667d8 (diff)
downloadcurl-ffb634d4ef5378c5f8255577fb65df3de82c0396.tar.gz
tool_listhelp: easier to generate with gen.pl
tool_listhelp.c is now a separate file with only the command line --help output, exactly as generated by gen.pl. This makes it easier to generate updates according to what's in the docs/cmdline-opts docs. cd $srcroot/docs/cmdline-opts ./gen.pl listhelp *.d > $srcroot/src/tool_listhelp.c With a configure build, this also works: make -C src listhelp Closes #7787
Diffstat (limited to 'tests')
-rw-r--r--tests/data/test14632
-rw-r--r--tests/data/test14642
-rwxr-xr-xtests/manpage-scan.pl12
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/data/test1463 b/tests/data/test1463
index 9326748ed..87a2d3ca2 100644
--- a/tests/data/test1463
+++ b/tests/data/test1463
@@ -37,7 +37,7 @@ curl file category --help
<stdout mode="text">
Usage: curl [options...] <url>
file: FILE protocol options
- --create-file-mode <mode> File mode (octal) for created files
+ --create-file-mode <mode> File mode for created files
-I, --head Show document info only
-r, --range <range> Retrieve only the bytes within RANGE
</stdout>
diff --git a/tests/data/test1464 b/tests/data/test1464
index 2ddacefa5..9821f097b 100644
--- a/tests/data/test1464
+++ b/tests/data/test1464
@@ -37,7 +37,7 @@ curl file category --help with lower/upper mix
<stdout mode="text">
Usage: curl [options...] <url>
file: FILE protocol options
- --create-file-mode <mode> File mode (octal) for created files
+ --create-file-mode <mode> File mode for created files
-I, --head Show document info only
-r, --range <range> Retrieve only the bytes within RANGE
</stdout>
diff --git a/tests/manpage-scan.pl b/tests/manpage-scan.pl
index ec2e7253d..219c4a463 100755
--- a/tests/manpage-scan.pl
+++ b/tests/manpage-scan.pl
@@ -31,7 +31,7 @@
#
# src/tool_getparam.c lists all options curl can parse
# docs/curl.1 documents all command line options
-# src/tool_help.c outputs all options with curl -h
+# src/tool_listhelp.c outputs all options with curl -h
# - make sure they're all in sync
#
# Output all deviances to stderr.
@@ -147,7 +147,7 @@ my %opts = (
'--no-keepalive' => 1,
'--no-progress-meter' => 1,
- # pretend these options without -no exist in curl.1 and tool_help.c
+ # pretend these options without -no exist in curl.1 and tool_listhelp.c
'--alpn' => 6,
'--npn' => 6,
'--eprt' => 6,
@@ -157,7 +157,7 @@ my %opts = (
'--sessionid' => 6,
'--progress-meter' => 6,
- # deprecated options do not need to be in tool_help.c nor curl.1
+ # deprecated options do not need to be in tool_listhelp.c nor curl.1
'--krb4' => 6,
'--ftp-ssl' => 6,
'--ftp-ssl-reqd' => 6,
@@ -236,7 +236,7 @@ close(R);
#########################################################################
# parse the curl code that outputs the curl -h list
-open(R, "<$root/src/tool_help.c") ||
+open(R, "<$root/src/tool_listhelp.c") ||
die "no input file";
my @toolhelp; # store all parsed parameters
while(<R>) {
@@ -286,10 +286,10 @@ foreach my $o (keys %opts) {
$missing.= " curl.1";
}
if($where & 4) {
- $exists .= " tool_help.c";
+ $exists .= " tool_listhelp.c";
}
else {
- $missing .= " tool_help.c";
+ $missing .= " tool_listhelp.c";
}
print STDERR "$o is not in$missing (but in$exists)\n";