database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

pg_regress: Don't use absolute paths for the diff

Browse Source 
Don't expand inputfile and outputfile to absolute paths globally, just
where needed.  In particular, pass them as is to the file name
arguments of the diff command, so that we don't see the full absolute
path in the diff header, which makes the diff unnecessarily verbose
and harder to read.

Discussion: https://www.postgresql.org/message-id/0cc82900-c457-1cee-3ab2-7b0f5d215061@2ndquadrant.com
This commit is contained in:
Peter Eisentraut 2019-02-21 18:34:19 +01:00
parent 1bb5e78218
commit 1995552deb
1 changed files with 5 additions and 9 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 */
exit(2);
snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", outputdir);
snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", make_absolute_path(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@", inputdir);
replace_string(line, "@abs_builddir@", outputdir);
replace_string(line, "@abs_srcdir@", make_absolute_path(inputdir));
replace_string(line, "@abs_builddir@", make_absolute_path(outputdir));
replace_string(line, "@testtablespace@", testtablespace);
replace_string(line, "@libdir@", dlpath);
replace_string(line, "@libdir@", make_absolute_path(dlpath));
replace_string(line, "@DLSUFFIX@", DLSUFFIX);
fputs(line, outfile);
}
@ -2239,10 +2239,6 @@ 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
*/
@ -2588,7 +2584,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"),
difffilename, logfilename);
make_absolute_path(difffilename), make_absolute_path(logfilename));
}
else
{