diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2019-02-23 09:37:25 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2019-02-23 09:37:25 +0100 |
| commit | f27522553992132d34c67caeea193d57934111cf (patch) | |
| tree | 52f8a13b09a516ba7eb48d7049f277a67291b409 /src | |
| parent | 4c23216002ac816f67fb87301290fa992115215e (diff) | |
| download | postgresql-f27522553992132d34c67caeea193d57934111cf.tar.gz postgresql-f27522553992132d34c67caeea193d57934111cf.zip | |
Revert "pg_regress: Don't use absolute paths for the diff"
This reverts commit 1995552deb5479a50ec9044f0179f906ff7772e0.
Several developers didn't like the new behavior.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/pg_regress.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index c28a78016b1..a18a6f6c45a 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -489,7 +489,7 @@ convert_sourcefiles_in(const char *source_subdir, const char *dest_dir, const ch /* Error logged in pgfnames */ exit(2); - snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", make_absolute_path(outputdir)); + snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", outputdir); #ifdef WIN32 @@ -553,10 +553,10 @@ convert_sourcefiles_in(const char *source_subdir, const char *dest_dir, const ch } while (fgets(line, sizeof(line), infile)) { - replace_string(line, "@abs_srcdir@", make_absolute_path(inputdir)); - replace_string(line, "@abs_builddir@", make_absolute_path(outputdir)); + replace_string(line, "@abs_srcdir@", inputdir); + replace_string(line, "@abs_builddir@", outputdir); replace_string(line, "@testtablespace@", testtablespace); - replace_string(line, "@libdir@", make_absolute_path(dlpath)); + replace_string(line, "@libdir@", dlpath); replace_string(line, "@DLSUFFIX@", DLSUFFIX); fputs(line, outfile); } @@ -2239,6 +2239,10 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc */ port = 0xC000 | (PG_VERSION_NUM & 0x3FFF); + inputdir = make_absolute_path(inputdir); + outputdir = make_absolute_path(outputdir); + dlpath = make_absolute_path(dlpath); + /* * Initialization */ @@ -2584,7 +2588,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc printf(_("The differences that caused some tests to fail can be viewed in the\n" "file \"%s\". A copy of the test summary that you see\n" "above is saved in the file \"%s\".\n\n"), - make_absolute_path(difffilename), make_absolute_path(logfilename)); + difffilename, logfilename); } else { |