aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-03-13 22:56:48 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-03-13 22:56:48 +0000
commit08ed6c3c5b510dcef2f2e2b8de207613153e43a0 (patch)
treefbdba6e9a9733d2d004e18f9bf736ab1ed2e384f
parentbe40754e9169b20a74a09734f68035fdfd45561b (diff)
downloadpostgresql-08ed6c3c5b510dcef2f2e2b8de207613153e43a0.tar.gz
postgresql-08ed6c3c5b510dcef2f2e2b8de207613153e43a0.zip
Regression makefile now needs to make separate lists of what to clean
for input/ and output/ directories, because with the addition of largeobject_1.source, they're not the same list. Apparently the current buildfarm process does not exercise whether 'make distclean' leaves a clean tree behind, else the farm would have been failing for awhile.
-rw-r--r--src/test/regress/GNUmakefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 94c4bbf9582..0c026c9bd86 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -6,7 +6,7 @@
# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.66 2007/02/09 15:56:00 petere Exp $
+# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.67 2007/03/13 22:56:48 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -86,9 +86,10 @@ $(NAME)$(DLSUFFIX): $(shlib)
# Test input and expected files. These are created by pg_regress itself, so we
# don't have a rule to create them. We do need rules to clean them however.
-file_list := $(subst .source,, $(notdir $(wildcard $(top_srcdir)/$(subdir)/input/*.source)))
-input_files := $(foreach file, $(file_list), sql/$(file).sql)
-output_files := $(foreach file, $(file_list), expected/$(file).out)
+ifile_list := $(subst .source,, $(notdir $(wildcard $(top_srcdir)/$(subdir)/input/*.source)))
+input_files := $(foreach file, $(ifile_list), sql/$(file).sql)
+ofile_list := $(subst .source,, $(notdir $(wildcard $(top_srcdir)/$(subdir)/output/*.source)))
+output_files := $(foreach file, $(ofile_list), expected/$(file).out)
ifneq ($(PORTNAME),win32)
abs_srcdir := $(shell cd $(srcdir) && pwd)