Fix incorrect path in pg_regress log messages.

MasaoFujii · MasaoFujii · commit 61fc420b5710 · 2015-07-08T01:54:17.000+09:00
Back-patch to 9.5 where the bug was introduced.

David Christensen
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -2223,7 +2223,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 				 temp_instance);
 		if (system(buf))
 		{
-			fprintf(stderr, _("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\nCommand was: %s\n"), progname, outputdir, buf);
+			fprintf(stderr, _("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\nCommand was: %s\n"), progname, temp_instance, buf);
 			exit(2);
 		}
 
@@ -2353,15 +2353,15 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 			if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0)
 #endif
 			{
-				fprintf(stderr, _("\n%s: postmaster failed\nExamine %s/log/postmaster.log for the reason\n"), progname, outputdir);
+				fprintf(stderr, _("\n%s: postmaster failed\nExamine %s/log/postmaster.log for the reason\n"), progname, temp_instance);
 				exit(2);
 			}
 
 			pg_usleep(1000000L);
 		}
 		if (i >= 60)
 		{
-			fprintf(stderr, _("\n%s: postmaster did not respond within 60 seconds\nExamine %s/log/postmaster.log for the reason\n"), progname, outputdir);
+			fprintf(stderr, _("\n%s: postmaster did not respond within 60 seconds\nExamine %s/log/postmaster.log for the reason\n"), progname, temp_instance);
 
 			/*
 			 * If we get here, the postmaster is probably wedged somewhere in

Original file line number	Diff line number	Diff line change
`@@ -2223,7 +2223,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc`
`2223`	`2223`	`temp_instance);`
`2224`	`2224`	`if (system(buf))`
`2225`	`2225`	`{`
`2226`		`- fprintf(stderr, _("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\nCommand was: %s\n"), progname, outputdir, buf);`
	`2226`	`+ fprintf(stderr, _("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\nCommand was: %s\n"), progname, temp_instance, buf);`
`2227`	`2227`	`exit(2);`
`2228`	`2228`	`}`
`2229`	`2229`
`@@ -2353,15 +2353,15 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc`
`2353`	`2353`	`if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0)`
`2354`	`2354`	`#endif`
`2355`	`2355`	`{`
`2356`		`- fprintf(stderr, _("\n%s: postmaster failed\nExamine %s/log/postmaster.log for the reason\n"), progname, outputdir);`
	`2356`	`+ fprintf(stderr, _("\n%s: postmaster failed\nExamine %s/log/postmaster.log for the reason\n"), progname, temp_instance);`
`2357`	`2357`	`exit(2);`
`2358`	`2358`	`}`
`2359`	`2359`
`2360`	`2360`	`pg_usleep(1000000L);`
`2361`	`2361`	`}`
`2362`	`2362`	`if (i >= 60)`
`2363`	`2363`	`{`
`2364`		`- fprintf(stderr, _("\n%s: postmaster did not respond within 60 seconds\nExamine %s/log/postmaster.log for the reason\n"), progname, outputdir);`
	`2364`	`+ fprintf(stderr, _("\n%s: postmaster did not respond within 60 seconds\nExamine %s/log/postmaster.log for the reason\n"), progname, temp_instance);`
`2365`	`2365`
`2366`	`2366`	`/*`
`2367`	`2367`	`* If we get here, the postmaster is probably wedged somewhere in`