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

petere · petere · commit f27522553992 · 2019-02-23T09:37:25.000+01:00
This reverts commit 1995552. Several developers didn't like the new behavior.
diff --git 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
 	{
