Convert the existing regression test scripts for the various optional

PLs to use the standard pg_regress infrastructure.  No changes in the
tests themselves.  Andrew Dunstan

Author: tglsfdc

src/pl/Makefile

@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/pl/Makefile,v 1.22 2003/11/29 19:52:12 pgsql Exp $
+# $PostgreSQL: pgsql/src/pl/Makefile,v 1.23 2005/05/14 17:55:20 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,6 @@ include $(top_builddir)/src/Makefile.global
 
 DIRS := plpgsql
 
-ifeq ($(with_tcl), yes)
-DIRS += tcl
-endif
-
 ifeq ($(with_perl), yes)
 DIRS += plperl
 endif
@@ -26,8 +22,22 @@ ifeq ($(with_python), yes)
 DIRS += plpython
 endif
 
+ifeq ($(with_tcl), yes)
+DIRS += tcl
+endif
+
 all install installdirs uninstall depend distprep:
-	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
+	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit 1; done
 
 clean distclean maintainer-clean:
 	@for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
+
+# We'd like check operations to run all the subtests before failing;
+# also insert a sleep to ensure the previous test backend exited before
+# we try to drop the regression database.
+check installcheck:
+	@CHECKERR=0; for dir in $(DIRS); do \
+		sleep 1; \
+		$(MAKE) -C $$dir $@ || CHECKERR=$$?; \
+	done; \
+	exit $$CHECKERR

src/pl/plperl/GNUmakefile

@@ -1,5 +1,5 @@
 # Makefile for PL/Perl
-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.18 2004/11/19 19:22:58 tgl Exp $
+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.19 2005/05/14 17:55:20 tgl Exp $
 
 subdir = src/pl/plperl
 top_builddir = ../../..
@@ -36,6 +36,8 @@ OBJS = plperl.o spi_internal.o SPI.o
 
 SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
 
+REGRESS = plperl
+
 include $(top_srcdir)/src/Makefile.shlib
 
 
@@ -59,8 +61,17 @@ installdirs:
 uninstall:
 	rm -f $(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX)
 
+installcheck: submake
+	$(SHELL) $(top_builddir)/src/test/regress/pg_regress --load-language=plperl $(REGRESS)
+
+.PHONY: submake
+submake:
+	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress
+
 clean distclean maintainer-clean: clean-lib
 	rm -f SPI.c $(OBJS)
+	rm -rf results
+	rm -f regression.diffs regression.out
 
 else # can't build
 

src/pl/plperl/test/test.expected renamed to src/pl/plperl/expected/plperl.out

@@ -1,4 +1,11 @@
+--
+-- checkpoint so that if we have a crash in the tests, replay of the
+-- just-completed CREATE DATABASE won't discard the core dump file
+--
 checkpoint;
+--
+-- Test result value processing
+--
 CREATE OR REPLACE FUNCTION perl_int(int) RETURNS INTEGER AS $$
 return undef;
 $$ LANGUAGE plperl;
@@ -277,6 +284,9 @@ SELECT (perl_out_params_set()).f3;
  PL/Perl
 (3 rows)
 
+--
+-- Check behavior with erroneous return values
+--
 CREATE TYPE footype AS (x INTEGER, y INTEGER);
 CREATE OR REPLACE FUNCTION foo_good() RETURNS SETOF footype AS $$
 return [
@@ -334,6 +344,9 @@ return [
 $$ LANGUAGE plperl;
 SELECT * FROM foo_set_bad();
 ERROR:  Perl hash contains nonexistent column "z"
+--
+-- Check passing a tuple argument
+--
 CREATE OR REPLACE FUNCTION perl_get_field(footype, text) RETURNS integer AS $$
     return $_[0]->{$_[1]};
 $$ LANGUAGE plperl;

src/pl/plperl/test/test_queries.sql renamed to src/pl/plperl/sql/plperl.sql

@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.18 2004/11/19 19:23:01 tgl Exp $
+# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.19 2005/05/14 17:55:21 tgl Exp $
 
 subdir = src/pl/plpython
 top_builddir = ../../..
@@ -58,6 +58,8 @@ endif
 
 SHLIB_LINK = $(BE_DLLLIBS) $(python_libspec) $(python_additional_libs)
 
+REGRESS = plpython_schema plpython_populate plpython_function plpython_test plpython_error plpython_drop
+
 include $(top_srcdir)/src/Makefile.shlib
 
 
@@ -78,16 +80,21 @@ installdirs:
 uninstall:
 	rm -f $(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX)
 
+installcheck: submake
+	$(SHELL) $(top_builddir)/src/test/regress/pg_regress --load-language=plpythonu $(REGRESS)
+
+.PHONY: submake
+submake:
+	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress
+
 clean distclean maintainer-clean: clean-lib
 	rm -f $(OBJS)
-	@rm -f error.diff feature.diff error.output feature.output test.log
+	rm -rf results
+	rm -f regression.diffs regression.out
 ifeq ($(PORTNAME), win32)
 	rm -f python${pytverstr}.def
 endif
 
-installcheck:
-	PATH=$(bindir):$$PATH $(SHELL) $(srcdir)/test.sh
-
 else # can't build
 
 all:

src/pl/plperl/test/runtest

@@ -0,0 +1,5 @@
+--
+-- For paranoia's sake, don't leave an untrusted language sitting around
+--
+SET client_min_messages = WARNING;
+DROP PROCEDURAL LANGUAGE plpythonu CASCADE;

src/pl/plpython/Makefile

@@ -1,3 +1,6 @@
+-- test error handling, i forgot to restore Warn_restart in
+-- the trigger handler once. the errors and subsequent core dump were
+-- interesting.
 SELECT invalid_type_uncaught('rick');
 WARNING:  plpython: in function invalid_type_uncaught:
 DETAIL:  plpy.SPIError: Unknown error in PLy_spi_prepare
@@ -16,6 +19,7 @@ SELECT valid_type('rick');
 
 (1 row)
 
+-- Security sandbox tests
 SELECT write_file('/tmp/plpython','Only trusted users should be able to do this!');
           write_file          
 ------------------------------