Skip to content

Commit b81eba6

Browse files
jconwayjconway
committed
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
1 parent 141fd1b commit b81eba6

File tree

1 file changed

+31
-27
lines changed

1 file changed

+31
-27
lines changed

‎src/test/regress/pg_regress.c‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,37 +2004,41 @@ help(void)
20042004
printf(_("Usage:\n %s [OPTION]... [EXTRA-TEST]...\n"), progname);
20052005
printf(_("\n"));
20062006
printf(_("Options:\n"));
2007-
printf(_(" --config-auth=DATADIR update authentication settings for DATADIR\n"));
2008-
printf(_(" --create-role=ROLE create the specified role before testing\n"));
2009-
printf(_(" --dbname=DB use database DB (default \"regression\")\n"));
2010-
printf(_(" --debug turn on debug mode in programs that are run\n"));
2011-
printf(_(" --dlpath=DIR look for dynamic libraries in DIR\n"));
2012-
printf(_(" --encoding=ENCODING use ENCODING as the encoding\n"));
2013-
printf(_(" --inputdir=DIR take input files from DIR (default \".\")\n"));
2014-
printf(_(" --launcher=CMD use CMD as launcher of psql\n"));
2015-
printf(_(" --load-extension=EXT load the named extension before running the\n"));
2016-
printf(_(" tests; can appear multiple times\n"));
2017-
printf(_(" --load-language=LANG load the named language before running the\n"));
2018-
printf(_(" tests; can appear multiple times\n"));
2019-
printf(_(" --max-connections=N maximum number of concurrent connections\n"));
2020-
printf(_(" (default is 0, meaning unlimited)\n"));
2021-
printf(_(" --max-concurrent-tests=N maximum number of concurrent tests in schedule\n"));
2022-
printf(_(" (default is 0, meaning unlimited)\n"));
2023-
printf(_(" --outputdir=DIR place output files in DIR (default \".\")\n"));
2024-
printf(_(" --schedule=FILE use test ordering schedule from FILE\n"));
2025-
printf(_(" (can be used multiple times to concatenate)\n"));
2026-
printf(_(" --temp-instance=DIR create a temporary instance in DIR\n"));
2027-
printf(_(" --use-existing use an existing installation\n"));
2007+
printf(_(" --bindir=BINPATH use BINPATH for programs that are run;\n"));
2008+
printf(_(" if empty, use PATH from the environment\n"));
2009+
printf(_(" --config-auth=DATADIR update authentication settings for DATADIR\n"));
2010+
printf(_(" --create-role=ROLE create the specified role before testing\n"));
2011+
printf(_(" --dbname=DB use database DB (default \"regression\")\n"));
2012+
printf(_(" --debug turn on debug mode in programs that are run\n"));
2013+
printf(_(" --dlpath=DIR look for dynamic libraries in DIR\n"));
2014+
printf(_(" --encoding=ENCODING use ENCODING as the encoding\n"));
2015+
printf(_(" -h, --help show this help, then exit\n"));
2016+
printf(_(" --inputdir=DIR take input files from DIR (default \".\")\n"));
2017+
printf(_(" --launcher=CMD use CMD as launcher of psql\n"));
2018+
printf(_(" --load-extension=EXT load the named extension before running the\n"));
2019+
printf(_(" tests; can appear multiple times\n"));
2020+
printf(_(" --load-language=LANG load the named language before running the\n"));
2021+
printf(_(" tests; can appear multiple times\n"));
2022+
printf(_(" --max-connections=N maximum number of concurrent connections\n"));
2023+
printf(_(" (default is 0, meaning unlimited)\n"));
2024+
printf(_(" --max-concurrent-tests=N maximum number of concurrent tests in schedule\n"));
2025+
printf(_(" (default is 0, meaning unlimited)\n"));
2026+
printf(_(" --outputdir=DIR place output files in DIR (default \".\")\n"));
2027+
printf(_(" --schedule=FILE use test ordering schedule from FILE\n"));
2028+
printf(_(" (can be used multiple times to concatenate)\n"));
2029+
printf(_(" --temp-instance=DIR create a temporary instance in DIR\n"));
2030+
printf(_(" --use-existing use an existing installation\n"));
2031+
printf(_(" -V, --version output version information, then exit\n"));
20282032
printf(_("\n"));
20292033
printf(_("Options for \"temp-instance\" mode:\n"));
2030-
printf(_(" --no-locale use C locale\n"));
2031-
printf(_(" --port=PORT start postmaster on PORT\n"));
2032-
printf(_(" --temp-config=FILE append contents of FILE to temporary config\n"));
2034+
printf(_(" --no-locale use C locale\n"));
2035+
printf(_(" --port=PORT start postmaster on PORT\n"));
2036+
printf(_(" --temp-config=FILE append contents of FILE to temporary config\n"));
20332037
printf(_("\n"));
20342038
printf(_("Options for using an existing installation:\n"));
2035-
printf(_(" --host=HOST use postmaster running on HOST\n"));
2036-
printf(_(" --port=PORT use postmaster running at PORT\n"));
2037-
printf(_(" --user=USER connect as USER\n"));
2039+
printf(_(" --host=HOST use postmaster running on HOST\n"));
2040+
printf(_(" --port=PORT use postmaster running at PORT\n"));
2041+
printf(_(" --user=USER connect as USER\n"));
20382042
printf(_("\n"));
20392043
printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n"));
20402044
printf(_("if the tests could not be run for some reason.\n"));

0 commit comments

Comments
 (0)