diff options
| author | Noah Misch | 2018-12-31 21:50:32 +0000 |
|---|---|---|
| committer | Noah Misch | 2018-12-31 21:50:32 +0000 |
| commit | 94600dd4f47d4eb659e0c35cab0aeb257f89cbf1 (patch) | |
| tree | 6e84a618ccad806a615ffec069fd55244b2fc5cf /src | |
| parent | d01e75d68eb2a478c57af92cc38f23f3ce5e1e0f (diff) | |
pg_regress: Promptly detect failed postmaster startup.
Detect it the way pg_ctl's wait_for_postmaster() does. When pg_regress
spawned a postmaster that failed startup, we were detecting that only
with "pg_regress: postmaster did not respond within 60 seconds".
Back-patch to 9.4 (all supported versions).
Reviewed by Tom Lane.
Discussion: https://postgr.es/m/20181231172922.GA199150@gust.leadboat.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/pg_regress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 63fe68914b8..2c469413a34 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -2414,7 +2414,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc * Fail immediately if postmaster has exited */ #ifndef WIN32 - if (kill(postmaster_pid, 0) != 0) + if (waitpid(postmaster_pid, NULL, WNOHANG) == postmaster_pid) #else if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0) #endif |