From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 19 Oct 2002 22:01:45 +0000 (+0000)
Subject: Fix pltcl self-test for recent changes to elog.
X-Git-Tag: REL9_0_0~16524
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=78b13fee45a499f65a0769fa8f0cc1d5a1fdb550;p=pg-rex%2Fsyncrep.git

Fix pltcl self-test for recent changes to elog.
---

diff --git a/src/pl/tcl/test/runtest b/src/pl/tcl/test/runtest
index c98402f0ab..32c1433b85 100755
--- 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 c7902386f4..8fa9fec651 100644
--- 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"
     }
 
     #