NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commited79edd

committed

Honor inputdir and outputdir when converting regression files.

When converting source files, pg_regress' inputdir and outputdir options wereignored when computing the locations of the destination files. In consequence,these options were effectively unusable when the regression inputs need tobe adjusted by pg_regress. This patch makes pg_regress put the converted filesin the same place that these options specify non-converted input or resultsfiles are to be found. Backpatched to all live branches.

1 parentb6948e1 commited79eddCopy full SHA for ed79edd

File tree

1 file changed

-4

lines changed

src/test/regress
- pg_regress.c

1 file changed

-4

lines changed

`‎src/test/regress/pg_regress.c`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ replace_string(char string, char replace, char *replacement)`
`418`	`418`	`* the given suffix.`
`419`	`419`	`*/`
`420`	`420`	`staticvoid`
`421`		`-convert_sourcefiles_in(charsource_subdir,chardest_subdir,char*suffix)`
	`421`	`+convert_sourcefiles_in(charsource_subdir,chardest_dir,chardest_subdir,charsuffix)`
`422`	`422`	`{`
`423`	`423`	`chartesttablespace[MAXPGPATH];`
`424`	`424`	`charindir[MAXPGPATH];`
`@@ -486,7 +486,8 @@ convert_sourcefiles_in(char source_subdir, char dest_subdir, char *suffix)`
`486`	`486`	`/* build the full actual paths to open */`
`487`	`487`	`snprintf(prefix,strlen(name)-6,"%s",name);`
`488`	`488`	`snprintf(srcfile,MAXPGPATH,"%s/%s",indir,*name);`
`489`		`-snprintf(destfile,MAXPGPATH,"%s/%s.%s",dest_subdir,prefix,suffix);`
	`489`	`+snprintf(destfile,MAXPGPATH,"%s/%s/%s.%s",dest_dir,dest_subdir,`
	`490`	`+prefix,suffix);`
`490`	`491`
`491`	`492`	`infile=fopen(srcfile,"r");`
`492`	`493`	`if (!infile)`
`@@ -533,8 +534,8 @@ convert_sourcefiles_in(char source_subdir, char dest_subdir, char *suffix)`
`533`	`534`	`staticvoid`
`534`	`535`	`convert_sourcefiles(void)`
`535`	`536`	`{`
`536`		`-convert_sourcefiles_in("input","sql","sql");`
`537`		`-convert_sourcefiles_in("output","expected","out");`
	`537`	`+convert_sourcefiles_in("input",inputdir,"sql","sql");`
	`538`	`+convert_sourcefiles_in("output",outputdir,"expected","out");`
`538`	`539`	`}`
`539`	`540`
`540`	`541`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commited79edd

File tree

1 file changed

1 file changed

`‎src/test/regress/pg_regress.c`

0 commit comments