mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "pg_regress: Don't use absolute paths for the diff"

Browse Source 
This reverts commit 1995552deb5479a50ec9044f0179f906ff7772e0.

Several developers didn't like the new behavior.
This commit is contained in:
Peter Eisentraut 2019-02-23 09:37:25 +01:00
parent 4c23216002
commit f275225539
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/regress/pg_regress.c
View File

@ -489,7 +489,7 @@ convert_sourcefiles_in(const char *source_subdir, const char *dest_dir, const ch
/* Error logged in pgfnames */ /* Error logged in pgfnames */
exit(2); exit(2);
snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", make_absolute_path(outputdir)); snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", outputdir);
#ifdef WIN32 #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)) while (fgets(line, sizeof(line), infile))
{ {
replace_string(line, "@abs_srcdir@", make_absolute_path(inputdir)); replace_string(line, "@abs_srcdir@", inputdir);
replace_string(line, "@abs_builddir@", make_absolute_path(outputdir)); replace_string(line, "@abs_builddir@", outputdir);
replace_string(line, "@testtablespace@", testtablespace); replace_string(line, "@testtablespace@", testtablespace);
replace_string(line, "@libdir@", make_absolute_path(dlpath)); replace_string(line, "@libdir@", dlpath);
replace_string(line, "@DLSUFFIX@", DLSUFFIX); replace_string(line, "@DLSUFFIX@", DLSUFFIX);
fputs(line, outfile); 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); port = 0xC000 | (PG_VERSION_NUM & 0x3FFF);
inputdir = make_absolute_path(inputdir);
outputdir = make_absolute_path(outputdir);
dlpath = make_absolute_path(dlpath);
/* /*
* Initialization * 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" 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" "file \"%s\". A copy of the test summary that you see\n"
"above is saved in the file \"%s\".\n\n"), "above is saved in the file \"%s\".\n\n"),
make_absolute_path(difffilename), make_absolute_path(logfilename)); difffilename, logfilename);
} }
else else
{ {