From 206f5b08ec8fcfa6e8d0cb9f6c94d72836dea2cf Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Sat, 17 Mar 2012 17:24:14 -0400 Subject: [PATCH] Honor inputdir and outputdir when converting regression files. When converting source files, pg_regress' inputdir and outputdir options were ignored when computing the locations of the destination files. In consequence, these options were effectively unusable when the regression inputs need to be adjusted by pg_regress. This patch makes pg_regress put the converted files in the same place that these options specify non-converted input or results files are to be found. Backpatched to all live branches. --- src/test/regress/pg_regress.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index f386220eb21..154e7692f0b 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -391,7 +391,7 @@ replace_string(char *string, char *replace, char *replacement) * the given suffix. */ static void -convert_sourcefiles_in(char *source, char *dest, char *suffix) +convert_sourcefiles_in(char *source, char * dest_dir, char *dest, char *suffix) { char abs_srcdir[MAXPGPATH]; char abs_builddir[MAXPGPATH]; @@ -490,7 +490,8 @@ convert_sourcefiles_in(char *source, char *dest, char *suffix) /* build the full actual paths to open */ snprintf(prefix, strlen(*name) - 6, "%s", *name); snprintf(srcfile, MAXPGPATH, "%s/%s", indir, *name); - snprintf(destfile, MAXPGPATH, "%s/%s.%s", dest, prefix, suffix); + snprintf(destfile, MAXPGPATH, "%s/%s/%s.%s", dest_dir, dest, + prefix, suffix); infile = fopen(srcfile, "r"); if (!infile) @@ -536,8 +537,8 @@ convert_sourcefiles_in(char *source, char *dest, char *suffix) static void convert_sourcefiles(void) { - convert_sourcefiles_in("input", "sql", "sql"); - convert_sourcefiles_in("output", "expected", "out"); + convert_sourcefiles_in("input", inputdir, "sql", "sql"); + convert_sourcefiles_in("output", outputdir, "expected", "out"); } /* -- 2.39.5