Commit26fdff1

committed

Allow multiple --temp-config arguments to pg_regress

This means that if, for example, TEMP_CONFIG is set and a Makefileexplicitly sets a temp-config file, both will now be used.Patch from John Gorman.

1 parent87cc6b5 commit26fdff1Copy full SHA for 26fdff1

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ static char *encoding = NULL;`
`80`	`80`	`static_stringlist*schedulelist=NULL;`
`81`	`81`	`static_stringlist*extra_tests=NULL;`
`82`	`82`	`staticchar*temp_instance=NULL;`
`83`		`-staticchar*temp_config=NULL;`
	`83`	`+static_stringlist*temp_configs=NULL;`
`84`	`84`	`staticboolnolocale= false;`
`85`	`85`	`staticbooluse_existing= false;`
`86`	`86`	`staticchar*hostname=NULL;`
`@@ -2117,7 +2117,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc`
`2117`	`2117`	`split_to_stringlist(strdup(optarg),", ",&extraroles);`
`2118`	`2118`	`break;`
`2119`	`2119`	`case19:`
`2120`		`-temp_config=strdup(optarg);`
	`2120`	`+add_stringlist_item(&temp_configs,optarg);`
`2121`	`2121`	`break;`
`2122`	`2122`	`case20:`
`2123`	`2123`	`use_existing= true;`
`@@ -2249,8 +2249,9 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc`
`2249`	`2249`	`fputs("log_temp_files = 128kB\n",pg_conf);`
`2250`	`2250`	`fputs("max_prepared_transactions = 2\n",pg_conf);`
`2251`	`2251`
`2252`		`-if (temp_config!=NULL)`
	`2252`	`+for (sl=temp_configs;sl!=NULL;sl=sl->next)`
`2253`	`2253`	`{`
	`2254`	`+char*temp_config=sl->str;`
`2254`	`2255`	`FILE*extra_conf;`
`2255`	`2256`	`charline_buf[1024];`
`2256`	`2257`

Comments

(0)