mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust pg_regress to print out the exact string given to system() when

Browse Source 
'make install' or 'initdb' fails.  Also minor simplification of fgets()
usage --- fgets guarantees a trailing null anyway.
This commit is contained in:
Tom Lane 2006-07-19 16:23:17 +00:00
parent 9d9a65bfa7
commit 5b8b137b16
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/regress/pg_regress.c
View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.3 2006/07/19 05:21:57 tgl Exp $
* $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.4 2006/07/19 16:23:17 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -320,8 +320,8 @@ load_resultmap(void)
progname, buf, strerror(errno));
exit_nicely(2);
}
memset(buf, 0, sizeof(buf));
while (fgets(buf, sizeof(buf)-1, f))
while (fgets(buf, sizeof(buf), f))
{
char *platform;
char *expected;
@ -969,8 +969,7 @@ run_schedule(const char *schedule)
exit_nicely(2);
}
memset(scbuf, 0, sizeof(scbuf));
while (fgets(scbuf, sizeof(scbuf)-1, scf))
while (fgets(scbuf, sizeof(scbuf), scf))
{
char *test = NULL;
char *c;
@ -1396,7 +1395,7 @@ main(int argc, char *argv[])
makeprog, top_builddir, temp_install, outputdir);
if (system(buf))
{
fprintf(stderr, _("\n%s: installation failed\nExamine %s/log/install.log for the reason.\n"), progname, outputdir);
fprintf(stderr, _("\n%s: installation failed\nExamine %s/log/install.log for the reason.\nCommand was: %s\n"), progname, outputdir, buf);
exit_nicely(2);
}
@ -1410,7 +1409,7 @@ main(int argc, char *argv[])
outputdir);
if (system(buf))
{
fprintf(stderr, _("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\n"), progname, outputdir);
fprintf(stderr, _("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\nCommand was: %s\n"), progname, outputdir, buf);
exit_nicely(2);
}