Remove a few of the new DROP-IF-EXISTS regression tests.

Commit 3301c83536e9da1e573e24ded2e610062dbf9cdc broke the build farm.
Let's try to fix that.

diff --git a/src/test/regress/expected/drop_if_exists.out b/src/test/regress/expected/drop_if_exists.out
index 4a500e6b766fa0b66dff5997849d2fda75a8f43e..dab73aaba6016d4b6796569be59296be35a2bfa7 100644 (file)
--- a/src/test/regress/expected/drop_if_exists.out
+++ b/src/test/regress/expected/drop_if_exists.out
@@ -86,12 +86,8 @@ NOTICE:  role "tg2" does not exist, skipping
 DROP GROUP tg1;
 ERROR:  role "tg1" does not exist
 -- collation
-DROP COLLATION test_collation_exists;
-ERROR:  collation "test_collation_exists" for encoding "UTF8" does not exist
 DROP COLLATION IF EXISTS test_collation_exists;
 NOTICE:  collation "test_collation_exists" does not exist, skipping
-CREATE COLLATION test_collation_exists FROM "POSIX";
-DROP COLLATION test_collation_exists;
 -- conversion
 DROP CONVERSION test_conversion_exists;
 ERROR:  conversion "test_conversion_exists" does not exist

diff --git a/src/test/regress/sql/drop_if_exists.sql b/src/test/regress/sql/drop_if_exists.sql
index f4a0ab16cbd28803a5a5a82bb7b5212e2c098f16..633056619aa7158ee05fcea3ffd5b18f1f10c247 100644 (file)
--- a/src/test/regress/sql/drop_if_exists.sql
+++ b/src/test/regress/sql/drop_if_exists.sql
@@ -109,10 +109,7 @@ DROP GROUP IF EXISTS tg1, tg2;
 DROP GROUP tg1;
 
 -- collation
-DROP COLLATION test_collation_exists;
 DROP COLLATION IF EXISTS test_collation_exists;
-CREATE COLLATION test_collation_exists FROM "POSIX";
-DROP COLLATION test_collation_exists;
 
 -- conversion
 DROP CONVERSION test_conversion_exists;