Fix pltcl self-test for recent changes to elog.

diff --git a/src/pl/tcl/test/runtest b/src/pl/tcl/test/runtest
index c98402f0abd6b017f2312409cff75e9208dbd400..32c1433b85e163109a1868d17d3674fc77425946 100755 (executable)
--- a/src/pl/tcl/test/runtest
+++ b/src/pl/tcl/test/runtest
@@ -20,6 +20,7 @@ psql -q -n -e $DBNAME <test_queries.sql > test.out 2>&1
 
 if diff test.expected test.out >/dev/null 2>&1 ; then
     echo "    Tests passed O.K."
+    rm test.out
 else
     echo "    Tests failed - look at diffs between"
     echo "    test.expected and test.out"

diff --git a/src/pl/tcl/test/test_setup.sql b/src/pl/tcl/test/test_setup.sql
index c7902386f40f73c6e9a73abe6cc85a09bcb63a28..8fa9fec6517755e11015ef9f3319a2cb640fb069 100644 (file)
--- a/src/pl/tcl/test/test_setup.sql
+++ b/src/pl/tcl/test/test_setup.sql
@@ -120,7 +120,7 @@ create function trig_pkey1_before() returns trigger as '
        #
         spi_execp -count 1 $GD(plan_pkey1) [list $NEW(key1) $NEW(key2)]
        if {$ret == "t"} {
-           elog WARN \\
+           elog ERROR \\
                "duplicate key ''$NEW(key1)'', ''$NEW(key2)'' for T_pkey1"
        }
     }
@@ -131,7 +131,7 @@ create function trig_pkey1_before() returns trigger as '
        #
         set n [spi_execp -count 1 $GD(plan_dta1) [list $OLD(key1) $OLD(key2)]]
        if {$n > 0} {
-           elog WARN \\
+           elog ERROR \\
                "key ''$OLD(key1)'', ''$OLD(key2)'' referenced by T_dta1"
        }
     }
@@ -173,7 +173,7 @@ create function trig_pkey2_before() returns trigger as '
     #
     set n [spi_execp -count 1 $GD(plan_pkey2) [list $NEW(key1) $NEW(key2)]]
     if {$n > 0} {
-       elog WARN \\
+       elog ERROR \\
            "duplicate key ''$NEW(key1)'', ''$NEW(key2)'' for T_pkey2"
     }
 
@@ -325,7 +325,7 @@ create function check_primkey() returns trigger as '
                  and A.attname  = ''[quote $key]''             \\
                  and A.atttypid = T.oid"]
            if {$n != 1} {
-               elog WARN "table $keyrel doesn''t have a field named $key"
+               elog ERROR "table $keyrel doesn''t have a field named $key"
            }
 
            #
@@ -362,7 +362,7 @@ create function check_primkey() returns trigger as '
     #
     set n [spi_execp -count 1 $GD($plankey) $arglist]
     if {$n <= 0} {
-        elog WARN "key for $GD($planrel) not in $keyrel"
+        elog ERROR "key for $GD($planrel) not in $keyrel"
     }
 
     #