diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-09-16 22:26:33 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-09-16 22:26:33 -0400 |
| commit | b2e3bea3afe9618764a8f15cc7d6d95036b7638b (patch) | |
| tree | 63f010b733bfa090de5bd6b96c5a43d511958761 /src | |
| parent | 3b8968f25232ad09001bf35ab4cc59f5a501193e (diff) | |
| download | postgresql-b2e3bea3afe9618764a8f15cc7d6d95036b7638b.tar.gz postgresql-b2e3bea3afe9618764a8f15cc7d6d95036b7638b.zip | |
PL/Python: Improve Python 3 regression test setup
Currently, we are making mangled copies of plpython/{expected,sql} to
plpython/python3/{expected,sql}, and run the tests in
plpython/python3. This has the disadvantage that the regression.diffs
file, if any, ends up in plpython/python3, which is not the normal
location. If we instead make the mangled copies in
plpython/{expected,sql}/python3/, we can run the tests from the normal
directory, regression.diffs ends up the normal place, and the
pg_regress invocation also becomes a lot simpler. It's also more
obvious at run time what's going on, because the tests end up being
named "python3/something" in the test output.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pl/plpython/.gitignore | 2 | ||||
| -rw-r--r-- | src/pl/plpython/Makefile | 35 |
2 files changed, 24 insertions, 13 deletions
diff --git a/src/pl/plpython/.gitignore b/src/pl/plpython/.gitignore index 07bee6a29c4..70c08db3231 100644 --- a/src/pl/plpython/.gitignore +++ b/src/pl/plpython/.gitignore @@ -1,5 +1,7 @@ /spiexceptions.h # Generated subdirectories +/expected/python3/ /log/ /results/ +/sql/python3/ /tmp_check/ diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index af6b4595336..122cdd984d6 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -103,6 +103,8 @@ REGRESS = \ plpython_subtransaction \ plpython_drop +REGRESS_PLPYTHON3_MANGLE := $(REGRESS) + # where to find psql for running the tests PSQLDIR = $(bindir) @@ -129,9 +131,20 @@ uninstall-data: ifeq ($(python_majorversion),3) # Adjust regression tests for Python 3 compatibility -prep3: - $(MKDIR_P) python3 python3/sql python3/expected - for file in $(srcdir)/sql/*.sql $(srcdir)/expected/*.out; do \ +# +# Mention those regression test files that need to be mangled in the +# variable REGRESS_PLPYTHON3_MANGLE. They will be copied to a +# subdirectory python3/ and have their Python syntax and other bits +# adjusted to work with Python 3. + +# Note that the order of the tests needs to be preserved in this +# expression. +REGRESS := $(foreach test,$(REGRESS),$(if $(filter $(test),$(REGRESS_PLPYTHON3_MANGLE)),python3/$(test),$(test))) + +.PHONY: pgregress-python3-mangle +pgregress-python3-mangle: + $(MKDIR_P) sql/python3 expected/python3 results/python3 + for file in $(patsubst %,$(srcdir)/sql/%.sql,$(REGRESS_PLPYTHON3_MANGLE)) $(patsubst %,$(srcdir)/expected/%*.out,$(REGRESS_PLPYTHON3_MANGLE)); do \ sed -e 's/except \([[:alpha:]][[:alpha:].]*\), *\([[:alpha:]][[:alpha:]]*\):/except \1 as \2:/g' \ -e "s/<type 'exceptions\.\([[:alpha:]]*\)'>/<class '\1'>/g" \ -e "s/<type 'long'>/<class 'int'>/g" \ @@ -143,26 +156,22 @@ prep3: -e "s/LANGUAGE plpython2u/LANGUAGE plpython3u/g" \ -e "s/EXTENSION plpythonu/EXTENSION plpython3u/g" \ -e "s/EXTENSION plpython2u/EXTENSION plpython3u/g" \ - $$file >`echo $$file | sed 's,^.*\(/[^/][^/]*/[^/][^/]*\)$$,python3\1,'` || exit; \ + $$file >`echo $$file | sed 's,^.*/\([^/][^/]*/\)\([^/][^/]*\)$$,\1python3/\2,'` || exit; \ done -clean3: - rm -rf python3/ +check installcheck: pgregress-python3-mangle + +pg_regress_clean_files += sql/python3/ expected/python3/ results/python3/ -check: all submake prep3 - $(pg_regress_check) --inputdir=./python3 --outputdir=./python3 $(REGRESS_OPTS) $(REGRESS) +endif # Python 3 -installcheck: submake prep3 - $(pg_regress_installcheck) --inputdir=./python3 --outputdir=./python3 $(REGRESS_OPTS) $(REGRESS) -clean: clean3 -else # not Python 3 check: all submake $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS) installcheck: submake $(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS) -endif # not Python 3 + .PHONY: submake submake: |