diff options
| author |   Aaron W. Swenson <titanofold@gentoo.org> | 2012-05-22 14:59:27 -0400 |
|---|---|---|
| committer | Aaron W. Swenson <titanofold@gentoo.org> | 2012-05-22 14:59:27 -0400 |
| commit | dad9c6d9e0f2141d03e1be123d702bc157c41cf1 (patch) | |
| tree | e0b5469aab732ead92051012d398127607d3ba23 | |
| parent | Commited upstream. (diff) | |
| download | patches-dad9c6d9e0f2141d03e1be123d702bc157c41cf1.tar.gz patches-dad9c6d9e0f2141d03e1be123d702bc157c41cf1.tar.bz2 patches-dad9c6d9e0f2141d03e1be123d702bc157c41cf1.zip | |
Fixed regress patch by regressing.
| -rw-r--r-- | regress.patch | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/regress.patch b/regress.patch index 2c5883a..cf706a6 100644 --- a/regress.patch +++ b/regress.patch @@ -1,51 +1,53 @@ -diff -Naurw a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c ---- a/src/test/regress/pg_regress.c 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/test/regress/pg_regress.c 2012-05-20 09:56:07.126786540 -0400 -@@ -798,7 +798,7 @@ +diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c +--- a/src/test/regress/pg_regress.c 2011-04-27 17:17:22.000000000 -0400 ++++ b/src/test/regress/pg_regress.c 2011-05-02 19:01:20.470763739 -0400 +@@ -806,7 +806,7 @@ datadir = tmp; /* psql will be installed into temp-install bindir */ - psqldir = bindir; -+ /* psqldir = bindir; */ ++ /* psqldir = bindir; */ /* * Set up shared library paths to include the temp install. -@@ -898,7 +898,7 @@ +@@ -906,7 +906,7 @@ /* And now we can build and execute the shell command */ snprintf(psql_cmd, sizeof(psql_cmd), - SYSTEMQUOTE "\"%s%spsql\" -X -c \"%s\" \"%s\"" SYSTEMQUOTE, -+ SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -c \"%s\" \"%s\"" SYSTEMQUOTE, ++ SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -c \"%s\" \"%s\"" SYSTEMQUOTE, psqldir ? psqldir : "", psqldir ? "/" : "", query_escaped, -@@ -2201,7 +2201,7 @@ +@@ -2207,8 +2207,8 @@ * Check if there is a postmaster running already. */ snprintf(buf2, sizeof(buf2), - SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE, -+ SYSTEMQUOTE "\"%s/psql\" -h @SOCKETDIR@ -X postgres <%s 2>%s" SYSTEMQUOTE, - bindir, DEVNULL, DEVNULL); +- bindir, DEVNULL, DEVNULL); ++ SYSTEMQUOTE "\"%s/psql\" -h @SOCKETDIR@ -X postgres <%s 2>%s" SYSTEMQUOTE, ++ psqldir, DEVNULL, DEVNULL); for (i = 0; i < 16; i++) -@@ -2233,7 +2233,7 @@ + { +@@ -2239,7 +2239,7 @@ */ header(_("starting postmaster")); snprintf(buf, sizeof(buf), - SYSTEMQUOTE "\"%s/postgres\" -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE, -+ SYSTEMQUOTE "\"%s/postgres\" -k @SOCKETDIR@ -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE, ++ SYSTEMQUOTE "\"%s/postgres\" -k @SOCKETDIR@ -D \"%s/data\" -F%s -c \"listen_addresses=%s\" > \"%s/log/postmaster.log\" 2>&1" SYSTEMQUOTE, bindir, temp_install, debug ? " -d 5" : "", hostname ? hostname : "", -diff -Naurw a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c ---- a/src/test/regress/pg_regress_main.c 2012-05-10 18:35:09.000000000 -0400 -+++ b/src/test/regress/pg_regress_main.c 2012-05-20 09:57:41.523599810 -0400 +diff -Naur a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c +--- a/src/test/regress/pg_regress_main.c 2011-04-27 17:17:22.000000000 -0400 ++++ b/src/test/regress/pg_regress_main.c 2011-05-02 19:02:23.571086780 -0400 @@ -64,7 +64,7 @@ "%s ", launcher); snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset, - SYSTEMQUOTE "\"%s%spsql\" -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE, -+ SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE, ++ SYSTEMQUOTE "\"%s%spsql\" -h @SOCKETDIR@ -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE, psqldir ? psqldir : "", psqldir ? "/" : "", dblist->str, |