In a VPATH build, resultmap must be one of the symlinked files, else

tglsfdc · tglsfdc · commit bf2e5eedf0c4 · 2002-01-08T21:00:30.000Z
pg_regress doesn't see it and you don't get any port-specific
comparisons.
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.35 2001/09/16 16:11:11 petere Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.36 2002/01/08 21:00:30 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -87,7 +87,7 @@ $(output_files): expected/%.out: output/%.source
 # $(srcdir) to the build directory.
 
 ifdef VPATH
-remaining_files_src := $(wildcard $(srcdir)/sql/*.sql) $(wildcard $(srcdir)/expected/*.out)
+remaining_files_src := $(wildcard $(srcdir)/sql/*.sql) $(wildcard $(srcdir)/expected/*.out) $(srcdir)/resultmap
 remaining_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(remaining_files_src))
 
 all: $(remaining_files_build)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.35 2001/09/16 16:11:11 petere Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.36 2002/01/08 21:00:30 tgl Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -87,7 +87,7 @@ $(output_files): expected/%.out: output/%.source`
`87`	`87`	`# $(srcdir) to the build directory.`
`88`	`88`
`89`	`89`	`ifdef VPATH`
`90`		`-remaining_files_src := $(wildcard $(srcdir)/sql/.sql) $(wildcard $(srcdir)/expected/.out)`
	`90`	`+remaining_files_src := $(wildcard $(srcdir)/sql/.sql) $(wildcard $(srcdir)/expected/.out) $(srcdir)/resultmap`
`91`	`91`	`remaining_files_build := $(patsubst $(srcdir)/%, $(abs_builddir)/%, $(remaining_files_src))`
`92`	`92`
`93`	`93`	`all: $(remaining_files_build)`