Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf275225

Browse files
committed
Revert "pg_regress: Don't use absolute paths for the diff"
This reverts commit1995552.Several developers didn't like the new behavior.
1 parent4c23216 commitf275225

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

‎src/test/regress/pg_regress.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ convert_sourcefiles_in(const char *source_subdir, const char *dest_dir, const ch
489489
/* Error logged in pgfnames */
490490
exit(2);
491491

492-
snprintf(testtablespace,MAXPGPATH,"%s/testtablespace",make_absolute_path(outputdir));
492+
snprintf(testtablespace,MAXPGPATH,"%s/testtablespace",outputdir);
493493

494494
#ifdefWIN32
495495

@@ -553,10 +553,10 @@ convert_sourcefiles_in(const char *source_subdir, const char *dest_dir, const ch
553553
}
554554
while (fgets(line,sizeof(line),infile))
555555
{
556-
replace_string(line,"@abs_srcdir@",make_absolute_path(inputdir));
557-
replace_string(line,"@abs_builddir@",make_absolute_path(outputdir));
556+
replace_string(line,"@abs_srcdir@",inputdir);
557+
replace_string(line,"@abs_builddir@",outputdir);
558558
replace_string(line,"@testtablespace@",testtablespace);
559-
replace_string(line,"@libdir@",make_absolute_path(dlpath));
559+
replace_string(line,"@libdir@",dlpath);
560560
replace_string(line,"@DLSUFFIX@",DLSUFFIX);
561561
fputs(line,outfile);
562562
}
@@ -2239,6 +2239,10 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
22392239
*/
22402240
port=0xC000 | (PG_VERSION_NUM&0x3FFF);
22412241

2242+
inputdir=make_absolute_path(inputdir);
2243+
outputdir=make_absolute_path(outputdir);
2244+
dlpath=make_absolute_path(dlpath);
2245+
22422246
/*
22432247
* Initialization
22442248
*/
@@ -2584,7 +2588,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
25842588
printf(_("The differences that caused some tests to fail can be viewed in the\n"
25852589
"file \"%s\". A copy of the test summary that you see\n"
25862590
"above is saved in the file \"%s\".\n\n"),
2587-
make_absolute_path(difffilename),make_absolute_path(logfilename));
2591+
difffilename,logfilename);
25882592
}
25892593
else
25902594
{

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp