diff options
| author |   Aaron W. Swenson <titanofold@gentoo.org> | 2011-03-20 17:54:01 -0400 |
|---|---|---|
| committer | Aaron W. Swenson <titanofold@gentoo.org> | 2011-03-20 17:54:01 -0400 |
| commit | 8ffd04e593bede129d5c6c50f1c5994b4f12e31b (patch) | |
| tree | 0f7d442fdbbf909b9a9d9336d672545f6afd8502 /regress.patch | |
| parent | Added LDFLAGS fix. (diff) | |
| download | patches-8ffd04e593bede129d5c6c50f1c5994b4f12e31b.tar.gz patches-8ffd04e593bede129d5c6c50f1c5994b4f12e31b.tar.bz2 patches-8ffd04e593bede129d5c6c50f1c5994b4f12e31b.zip | |
Don't really need the postgresql-${SLOT} in the name of the files.
Diffstat (limited to 'regress.patch')
| -rw-r--r-- | regress.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/regress.patch b/regress.patch new file mode 100644 index 0000000..5a544e4 --- /dev/null +++ b/regress.patch @@ -0,0 +1,53 @@ +diff -Naur a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c +--- a/src/test/regress/pg_regress.c 2011-01-27 21:23:36.000000000 -0500 ++++ b/src/test/regress/pg_regress.c 2011-03-20 14:19:17.536295541 -0400 +@@ -791,7 +791,7 @@ + datadir = tmp; + + /* psql will be installed into temp-install bindir */ +- psqldir = bindir; ++ /* psqldir = bindir; */ + + /* + * Set up shared library paths to include the temp install. +@@ -889,7 +889,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, + psqldir ? psqldir : "", + psqldir ? "/" : "", + query_escaped, +@@ -2137,8 +2137,8 @@ + * Check if there is a postmaster running already. + */ + snprintf(buf2, sizeof(buf2), +- SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE, +- bindir, DEVNULL, DEVNULL); ++ SYSTEMQUOTE "\"%s/psql\" -h @SOCKETDIR@ -X postgres <%s 2>%s" SYSTEMQUOTE, ++ psqldir, DEVNULL, DEVNULL); + + for (i = 0; i < 16; i++) + { +@@ -2169,7 +2169,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, + bindir, temp_install, + debug ? " -d 5" : "", + hostname ? hostname : "", +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-01-27 21:23:36.000000000 -0500 ++++ b/src/test/regress/pg_regress_main.c 2011-03-20 14:20:35.546295541 -0400 +@@ -59,7 +59,7 @@ + add_stringlist_item(expectfiles, expectfile); + + snprintf(psql_cmd, sizeof(psql_cmd), +- 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, + psqldir ? psqldir : "", + psqldir ? "/" : "", + dblist->str, |