git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Add missing options to pg_regress help() output

2017年10月13日 23:06:41 +0000 (16:06 -0700)

committer Joe Conway <mail@joeconway.com>

2017年10月13日 23:06:41 +0000 (16:06 -0700)

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

src/test/regress/pg_regress.c patch | blob | blame | history

diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c

index 7c628df4b427a72dacef071d8011b657b6e4ea6b..0156b00bfb07090549956da19a3bcb3ecbe7b1c5 100644 (file)

--- a/src/test/regress/pg_regress.c

+++ b/src/test/regress/pg_regress.c

@@ -2004,37 +2004,41 @@ help(void)

printf(_("Usage:\n %s [OPTION]... [EXTRA-TEST]...\n"), progname);

printf(_("\n"));

printf(_("Options:\n"));

- printf(_(" --config-auth=DATADIR update authentication settings for DATADIR\n"));

- printf(_(" --create-role=ROLE create the specified role before testing\n"));

- printf(_(" --dbname=DB use database DB (default \"regression\")\n"));

- printf(_(" --debug turn on debug mode in programs that are run\n"));

- printf(_(" --dlpath=DIR look for dynamic libraries in DIR\n"));

- printf(_(" --encoding=ENCODING use ENCODING as the encoding\n"));

- printf(_(" --inputdir=DIR take input files from DIR (default \".\")\n"));

- printf(_(" --launcher=CMD use CMD as launcher of psql\n"));

- printf(_(" --load-extension=EXT load the named extension before running the\n"));

- printf(_(" tests; can appear multiple times\n"));

- printf(_(" --load-language=LANG load the named language before running the\n"));

- printf(_(" tests; can appear multiple times\n"));

- printf(_(" --max-connections=N maximum number of concurrent connections\n"));

- printf(_(" (default is 0, meaning unlimited)\n"));

- printf(_(" --max-concurrent-tests=N maximum number of concurrent tests in schedule\n"));

- printf(_(" (default is 0, meaning unlimited)\n"));

- printf(_(" --outputdir=DIR place output files in DIR (default \".\")\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(_(" --bindir=BINPATH use BINPATH for programs that are run;\n"));

+ printf(_(" if empty, use PATH from the environment\n"));

+ printf(_(" --config-auth=DATADIR update authentication settings for DATADIR\n"));

+ printf(_(" --create-role=ROLE create the specified role before testing\n"));

+ printf(_(" --dbname=DB use database DB (default \"regression\")\n"));

+ printf(_(" --debug turn on debug mode in programs that are run\n"));

+ printf(_(" --dlpath=DIR look for dynamic libraries in DIR\n"));

+ printf(_(" --encoding=ENCODING use ENCODING as the encoding\n"));

+ printf(_(" -h, --help show this help, then exit\n"));

+ printf(_(" --inputdir=DIR take input files from DIR (default \".\")\n"));

+ printf(_(" --launcher=CMD use CMD as launcher of psql\n"));

+ printf(_(" --load-extension=EXT load the named extension before running the\n"));

+ printf(_(" tests; can appear multiple times\n"));

+ printf(_(" --load-language=LANG load the named language before running the\n"));

+ printf(_(" tests; can appear multiple times\n"));

+ printf(_(" --max-connections=N maximum number of concurrent connections\n"));

+ printf(_(" (default is 0, meaning unlimited)\n"));

+ printf(_(" --max-concurrent-tests=N maximum number of concurrent tests in schedule\n"));

+ printf(_(" (default is 0, meaning unlimited)\n"));

+ printf(_(" --outputdir=DIR place output files in DIR (default \".\")\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(_("Options for \"temp-instance\" mode:\n"));

- printf(_(" --no-locale use C locale\n"));

- printf(_(" --port=PORT start postmaster on PORT\n"));

- printf(_(" --temp-config=FILE append contents of FILE to temporary config\n"));

+ printf(_(" --no-locale use C locale\n"));

+ printf(_(" --port=PORT start postmaster on PORT\n"));

+ printf(_(" --temp-config=FILE append contents of FILE to temporary config\n"));

printf(_("\n"));

printf(_("Options for using an existing installation:\n"));

- printf(_(" --host=HOST use postmaster running on HOST\n"));

- printf(_(" --port=PORT use postmaster running at PORT\n"));

- printf(_(" --user=USER connect as USER\n"));

+ printf(_(" --host=HOST use postmaster running on HOST\n"));

+ printf(_(" --port=PORT use postmaster running at PORT\n"));

+ printf(_(" --user=USER connect as USER\n"));

printf(_("\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"));

This is the main PostgreSQL git repository.

RSS Atom