summaryrefslogtreecommitdiff
path: root/src/test/regress/GNUmakefile
diff options
context:
space:
mode:
authorTom Lane2021-12-20 19:15:52 +0000
committerTom Lane2021-12-20 19:15:52 +0000
commitdc9c3b0ff21465fa89d71eecf5e6cc956d647eca (patch)
tree3c6f695eb5159d9673d3ce749d7a1499ca779c18 /src/test/regress/GNUmakefile
parentd1029bb5a26cb84b116b0dee4dde312291359f2a (diff)
Remove dynamic translation of regression test scripts, step 2.
"git mv" all the input/*.source and output/*.source files into the corresponding sql/ and expected/ directories. Then remove the pg_regress and Makefile infrastructure associated with dynamic translation. Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/test/regress/GNUmakefile')
-rw-r--r--src/test/regress/GNUmakefile12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index fe6e0c98aa2..330eca2b839 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -69,19 +69,12 @@ all: all-lib
# Ensure parallel safety if a build is started in this directory
$(OBJS): | submake-libpgport submake-generated-headers
-# 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.
-input_files = $(patsubst $(srcdir)/input/%.source,sql/%.sql, $(wildcard $(srcdir)/input/*.source))
-output_files := $(patsubst $(srcdir)/output/%.source,expected/%.out, $(wildcard $(srcdir)/output/*.source))
-
# not installed by default
regress_data_files = \
- $(filter-out $(addprefix $(srcdir)/,$(output_files)),$(wildcard $(srcdir)/expected/*.out)) \
- $(wildcard $(srcdir)/input/*.source) \
- $(wildcard $(srcdir)/output/*.source) \
- $(filter-out $(addprefix $(srcdir)/,$(input_files)),$(wildcard $(srcdir)/sql/*.sql)) \
+ $(wildcard $(srcdir)/sql/*.sql) \
+ $(wildcard $(srcdir)/expected/*.out) \
$(wildcard $(srcdir)/data/*.data) \
$(srcdir)/parallel_schedule $(srcdir)/resultmap
@@ -162,6 +155,5 @@ clean distclean maintainer-clean: clean-lib
rm -f $(OBJS) refint$(DLSUFFIX) autoinc$(DLSUFFIX)
rm -f pg_regress_main.o pg_regress.o pg_regress$(X)
# things created by various check targets
- rm -f $(output_files) $(input_files)
rm -rf testtablespace
rm -rf $(pg_regress_clean_files)