Print out diff status code when we think there's a hard failure.

tglsfdc · tglsfdc · commit 7da24bcbc19d · 2006-07-20T03:30:58.000Z
May help in debugging behavior on Windows.
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -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.8 2006/07/20 02:15:17 tgl Exp $
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.9 2006/07/20 03:30:58 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -203,6 +203,10 @@ stop_postmaster(void)
 		/* We use pg_ctl to issue the kill and wait for stop */
 		char buf[MAXPGPATH * 2];
 
+		/* On Windows, system() seems not to force fflush, so... */
+		fflush(stdout);
+		fflush(stderr);
+
 		snprintf(buf, sizeof(buf),
 				 SYSTEMQUOTE "\"%s/pg_ctl\" stop -D \"%s/data\" -s -m fast" SYSTEMQUOTE,
 				 bindir, temp_install);
@@ -843,7 +847,7 @@ results_differ(const char *testname)
 	r = system(cmd);
 	if (!WIFEXITED(r) || WEXITSTATUS(r) > 1)
 	{
-		fprintf(stderr, _("diff command failed: %s\n"), cmd);
+		fprintf(stderr, _("diff command failed with status %d: %s\n"), r, cmd);
 		exit_nicely(2);
 	}
 
@@ -872,7 +876,8 @@ results_differ(const char *testname)
 		r = system(cmd);
 		if (!WIFEXITED(r) || WEXITSTATUS(r) > 1)
 		{
-			fprintf(stderr, _("diff command failed: %s\n"), cmd);
+			fprintf(stderr, _("diff command failed with status %d: %s\n"),
+					r, cmd);
 			exit_nicely(2);
 		}
 
@@ -902,7 +907,7 @@ results_differ(const char *testname)
 	r = system(cmd);
 	if (!WIFEXITED(r) || WEXITSTATUS(r) > 1)
 	{
-		fprintf(stderr, _("diff command failed: %s\n"), cmd);
+		fprintf(stderr, _("diff command failed with status %d: %s\n"), r, cmd);
 		exit_nicely(2);
 	}
 

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.8 2006/07/20 02:15:17 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.9 2006/07/20 03:30:58 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -203,6 +203,10 @@ stop_postmaster(void)`
`203`	`203`	`/* We use pg_ctl to issue the kill and wait for stop */`
`204`	`204`	`char buf[MAXPGPATH * 2];`
`205`	`205`
	`206`	`+ /* On Windows, system() seems not to force fflush, so... */`
	`207`	`+ fflush(stdout);`
	`208`	`+ fflush(stderr);`
	`209`	`+`
`206`	`210`	`snprintf(buf, sizeof(buf),`
`207`	`211`	`SYSTEMQUOTE "\"%s/pg_ctl\" stop -D \"%s/data\" -s -m fast" SYSTEMQUOTE,`
`208`	`212`	`bindir, temp_install);`
`@@ -843,7 +847,7 @@ results_differ(const char *testname)`
`843`	`847`	`r = system(cmd);`
`844`	`848`	`if (!WIFEXITED(r) \|\| WEXITSTATUS(r) > 1)`
`845`	`849`	`{`
`846`		`- fprintf(stderr, _("diff command failed: %s\n"), cmd);`
	`850`	`+ fprintf(stderr, _("diff command failed with status %d: %s\n"), r, cmd);`
`847`	`851`	`exit_nicely(2);`
`848`	`852`	`}`
`849`	`853`
`@@ -872,7 +876,8 @@ results_differ(const char *testname)`
`872`	`876`	`r = system(cmd);`
`873`	`877`	`if (!WIFEXITED(r) \|\| WEXITSTATUS(r) > 1)`
`874`	`878`	`{`
`875`		`- fprintf(stderr, _("diff command failed: %s\n"), cmd);`
	`879`	`+ fprintf(stderr, _("diff command failed with status %d: %s\n"),`
	`880`	`+ r, cmd);`
`876`	`881`	`exit_nicely(2);`
`877`	`882`	`}`
`878`	`883`
`@@ -902,7 +907,7 @@ results_differ(const char *testname)`
`902`	`907`	`r = system(cmd);`
`903`	`908`	`if (!WIFEXITED(r) \|\| WEXITSTATUS(r) > 1)`
`904`	`909`	`{`
`905`		`- fprintf(stderr, _("diff command failed: %s\n"), cmd);`
	`910`	`+ fprintf(stderr, _("diff command failed with status %d: %s\n"), r, cmd);`
`906`	`911`	`exit_nicely(2);`
`907`	`912`	`}`
`908`	`913`