Commit cbabb70
committed
Honor PGCTLTIMEOUT environment variable for pg_regress' startup wait.
In commit 2ffa869 we made pg_ctl recognize an environment variable
PGCTLTIMEOUT to set the default timeout for starting and stopping the
postmaster. However, pg_regress uses pg_ctl only for the "stop" end of
that; it has bespoke code for starting the postmaster, and that code has
historically had a hard-wired 60-second timeout. Further buildfarm
experience says it'd be a good idea if that timeout were also controlled
by PGCTLTIMEOUT, so let's make it so. Like the previous patch, back-patch
to all active branches.
Discussion: <13969.1461191936@sss.pgh.pa.us>1 parent b4e0f18 commit cbabb70
1 file changed
+21
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2185 | 2185 | | |
2186 | 2186 | | |
2187 | 2187 | | |
| 2188 | + | |
| 2189 | + | |
2188 | 2190 | | |
2189 | 2191 | | |
2190 | 2192 | | |
| |||
2335 | 2337 | | |
2336 | 2338 | | |
2337 | 2339 | | |
2338 | | - | |
2339 | | - | |
2340 | | - | |
| 2340 | + | |
| 2341 | + | |
| 2342 | + | |
| 2343 | + | |
| 2344 | + | |
2341 | 2345 | | |
2342 | | - | |
| 2346 | + | |
| 2347 | + | |
| 2348 | + | |
| 2349 | + | |
| 2350 | + | |
| 2351 | + | |
| 2352 | + | |
| 2353 | + | |
| 2354 | + | |
| 2355 | + | |
| 2356 | + | |
2343 | 2357 | | |
2344 | 2358 | | |
2345 | 2359 | | |
| |||
2360 | 2374 | | |
2361 | 2375 | | |
2362 | 2376 | | |
2363 | | - | |
| 2377 | + | |
2364 | 2378 | | |
2365 | | - | |
| 2379 | + | |
| 2380 | + | |
2366 | 2381 | | |
2367 | 2382 | | |
2368 | 2383 | | |
| |||
0 commit comments