mirror of
				https://github.com/postgres/postgres.git
				synced 2025-10-31 00:03:57 -04:00 
			
		
		
		
	Fix incorrect path in pg_regress log messages.
Back-patch to 9.5 where the bug was introduced. David Christensen
This commit is contained in:
		
							parent
							
								
									9a8f583310
								
							
						
					
					
						commit
						61fc420b57
					
				| @ -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,7 +2353,7 @@ 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); | ||||
| 			} | ||||
| 
 | ||||
| @ -2361,7 +2361,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc | ||||
| 		} | ||||
| 		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 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user