NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5b8b137

committed

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

'make install' or 'initdb' fails. Also minor simplification of fgets()usage --- fgets guarantees a trailing null anyway.

1 parent9d9a65b commit5b8b137Copy full SHA for 5b8b137

File tree

1 file changed

-7

lines changed

src/test/regress
- pg_regress.c

1 file changed

-7

lines changed

`‎src/test/regress/pg_regress.c‎`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.3 2006/07/1905:21:57 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.4 2006/07/1916:23:17 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -320,8 +320,8 @@ load_resultmap(void)`
`320`	`320`	`progname,buf,strerror(errno));`
`321`	`321`	`exit_nicely(2);`
`322`	`322`	`}`
`323`		`-memset(buf,0,sizeof(buf));`
`324`		`-while (fgets(buf,sizeof(buf)-1,f))`
	`323`	`+`
	`324`	`+while (fgets(buf,sizeof(buf),f))`
`325`	`325`	`{`
`326`	`326`	`char*platform;`
`327`	`327`	`char*expected;`
`@@ -969,8 +969,7 @@ run_schedule(const char *schedule)`
`969`	`969`	`exit_nicely(2);`
`970`	`970`	`}`
`971`	`971`
`972`		`-memset(scbuf,0,sizeof(scbuf));`
`973`		`-while (fgets(scbuf,sizeof(scbuf)-1,scf))`
	`972`	`+while (fgets(scbuf,sizeof(scbuf),scf))`
`974`	`973`	`{`
`975`	`974`	`char*test=NULL;`
`976`	`975`	`char*c;`
`@@ -1396,7 +1395,7 @@ main(int argc, char *argv[])`
`1396`	`1395`	`makeprog,top_builddir,temp_install,outputdir);`
`1397`	`1396`	`if (system(buf))`
`1398`	`1397`	`{`
`1399`		`-fprintf(stderr,_("\n%s: installation failed\nExamine %s/log/install.log for the reason.\n"),progname,outputdir);`
	`1398`	`+fprintf(stderr,_("\n%s: installation failed\nExamine %s/log/install.log for the reason.\nCommand was: %s\n"),progname,outputdir,buf);`
`1400`	`1399`	`exit_nicely(2);`
`1401`	`1400`	`}`
`1402`	`1401`
`@@ -1410,7 +1409,7 @@ main(int argc, char *argv[])`
`1410`	`1409`	`outputdir);`
`1411`	`1410`	`if (system(buf))`
`1412`	`1411`	`{`
`1413`		`-fprintf(stderr,_("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\n"),progname,outputdir);`
	`1412`	`+fprintf(stderr,_("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\nCommand was: %s\n"),progname,outputdir,buf);`
`1414`	`1413`	`exit_nicely(2);`
`1415`	`1414`	`}`
`1416`	`1415`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5b8b137

File tree

1 file changed

1 file changed

`‎src/test/regress/pg_regress.c‎`

0 commit comments