rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing options to pg_regress help() output 

A few command line options accepted by pg_regress were not being output
by help(), including --help itself. Add that one, as well as --version
and --bindir, and the corresponding short options for the first two.

We could consider this for backpatching, but it did not seem worthwhile
and no one else advocated for it, so apply only to master for now.

Author: Joe Conway
Reviewed-By: Tom Lane
Discussion: https://postgr.es/m/dd519469-06d7-2662-83ef-c926f6c4f0f1%40joeconway.com
This commit is contained in:
Joe Conway 2017-10-13 16:06:41 -07:00
parent 141fd1b66c
commit b81eba6a65
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/test/regress/pg_regress.c
View File

@ -2004,37 +2004,41 @@ help(void)
printf(_("Usage:\n %s [OPTION]... [EXTRA-TEST]...\n"), progname); printf(_("Usage:\n %s [OPTION]... [EXTRA-TEST]...\n"), progname);
printf(_("\n")); printf(_("\n"));
printf(_("Options:\n")); printf(_("Options:\n"));
printf(_(" --config-auth=DATADIR update authentication settings for DATADIR\n")); printf(_(" --bindir=BINPATH use BINPATH for programs that are run;\n"));
printf(_(" --create-role=ROLE create the specified role before testing\n")); printf(_(" if empty, use PATH from the environment\n"));
printf(_(" --dbname=DB use database DB (default \"regression\")\n")); printf(_(" --config-auth=DATADIR update authentication settings for DATADIR\n"));
printf(_(" --debug turn on debug mode in programs that are run\n")); printf(_(" --create-role=ROLE create the specified role before testing\n"));
printf(_(" --dlpath=DIR look for dynamic libraries in DIR\n")); printf(_(" --dbname=DB use database DB (default \"regression\")\n"));
printf(_(" --encoding=ENCODING use ENCODING as the encoding\n")); printf(_(" --debug turn on debug mode in programs that are run\n"));
printf(_(" --inputdir=DIR take input files from DIR (default \".\")\n")); printf(_(" --dlpath=DIR look for dynamic libraries in DIR\n"));
printf(_(" --launcher=CMD use CMD as launcher of psql\n")); printf(_(" --encoding=ENCODING use ENCODING as the encoding\n"));
printf(_(" --load-extension=EXT load the named extension before running the\n")); printf(_(" -h, --help show this help, then exit\n"));
printf(_(" tests; can appear multiple times\n")); printf(_(" --inputdir=DIR take input files from DIR (default \".\")\n"));
printf(_(" --load-language=LANG load the named language before running the\n")); printf(_(" --launcher=CMD use CMD as launcher of psql\n"));
printf(_(" tests; can appear multiple times\n")); printf(_(" --load-extension=EXT load the named extension before running the\n"));
printf(_(" --max-connections=N maximum number of concurrent connections\n")); printf(_(" tests; can appear multiple times\n"));
printf(_(" (default is 0, meaning unlimited)\n")); printf(_(" --load-language=LANG load the named language before running the\n"));
printf(_(" --max-concurrent-tests=N maximum number of concurrent tests in schedule\n")); printf(_(" tests; can appear multiple times\n"));
printf(_(" (default is 0, meaning unlimited)\n")); printf(_(" --max-connections=N maximum number of concurrent connections\n"));
printf(_(" --outputdir=DIR place output files in DIR (default \".\")\n")); printf(_(" (default is 0, meaning unlimited)\n"));
printf(_(" --schedule=FILE use test ordering schedule from FILE\n")); printf(_(" --max-concurrent-tests=N maximum number of concurrent tests in schedule\n"));
printf(_(" (can be used multiple times to concatenate)\n")); printf(_(" (default is 0, meaning unlimited)\n"));
printf(_(" --temp-instance=DIR create a temporary instance in DIR\n")); printf(_(" --outputdir=DIR place output files in DIR (default \".\")\n"));
printf(_(" --use-existing use an existing installation\n")); printf(_(" --schedule=FILE use test ordering schedule from FILE\n"));
printf(_(" (can be used multiple times to concatenate)\n"));
printf(_(" --temp-instance=DIR create a temporary instance in DIR\n"));
printf(_(" --use-existing use an existing installation\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_("\n")); printf(_("\n"));
printf(_("Options for \"temp-instance\" mode:\n")); printf(_("Options for \"temp-instance\" mode:\n"));
printf(_(" --no-locale use C locale\n")); printf(_(" --no-locale use C locale\n"));
printf(_(" --port=PORT start postmaster on PORT\n")); printf(_(" --port=PORT start postmaster on PORT\n"));
printf(_(" --temp-config=FILE append contents of FILE to temporary config\n")); printf(_(" --temp-config=FILE append contents of FILE to temporary config\n"));
printf(_("\n")); printf(_("\n"));
printf(_("Options for using an existing installation:\n")); printf(_("Options for using an existing installation:\n"));
printf(_(" --host=HOST use postmaster running on HOST\n")); printf(_(" --host=HOST use postmaster running on HOST\n"));
printf(_(" --port=PORT use postmaster running at PORT\n")); printf(_(" --port=PORT use postmaster running at PORT\n"));
printf(_(" --user=USER connect as USER\n")); printf(_(" --user=USER connect as USER\n"));
printf(_("\n")); printf(_("\n"));
printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n")); printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n"));
printf(_("if the tests could not be run for some reason.\n")); printf(_("if the tests could not be run for some reason.\n"));