diff options
| author | Robert Haas <rhaas@postgresql.org> | 2013-11-08 14:40:41 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2013-11-08 14:40:41 -0500 |
| commit | 9b4d52f2095be96ca238ce41f6963ec56376491f (patch) | |
| tree | 28cb77b7b68214cca1dfc426ccf28ec9496a83fb /src/test/isolation/isolation_main.c | |
| parent | 07cacba983ef79be4a84fcd0e0ca3b5fcb85dd65 (diff) | |
| download | postgresql-9b4d52f2095be96ca238ce41f6963ec56376491f.tar.gz postgresql-9b4d52f2095be96ca238ce41f6963ec56376491f.zip | |
Fix pg_isolation_regress to work outside its build directory.
This makes it possible to, for example, use the isolation tester to
test a contrib module.
Andres Freund
Diffstat (limited to 'src/test/isolation/isolation_main.c')
| -rw-r--r-- | src/test/isolation/isolation_main.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/test/isolation/isolation_main.c b/src/test/isolation/isolation_main.c index 48a0e1235a2..b3a8ff0530b 100644 --- a/src/test/isolation/isolation_main.c +++ b/src/test/isolation/isolation_main.c @@ -12,6 +12,9 @@ #include "pg_regress.h" +char isolation_exec[MAXPGPATH]; +#define PG_ISOLATION_VERSIONSTR "isolationtester (PostgreSQL) " PG_VERSION "\n" + /* * start an isolation tester process for specified file (including * redirection), and return process ID @@ -58,7 +61,8 @@ isolation_start_test(const char *testname, "%s ", launcher); snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset, - SYSTEMQUOTE "\"./isolationtester\" \"dbname=%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE, + SYSTEMQUOTE "\"%s\" \"dbname=%s\" < \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE, + isolation_exec, dblist->str, infile, outfile); @@ -76,8 +80,16 @@ isolation_start_test(const char *testname, } static void -isolation_init(void) +isolation_init(int argc, char **argv) { + /* look for isolationtester binary */ + if (find_other_exec(argv[0], "isolationtester", + PG_ISOLATION_VERSIONSTR, isolation_exec) != 0) + { + fprintf(stderr, _("could not find proper isolationtester binary\n")); + exit(2); + } + /* set default regression database name */ add_stringlist_item(&dblist, "isolationtest"); } |