Minor sepgsql regression test fixes.

diff --git a/contrib/sepgsql/.gitignore b/contrib/sepgsql/.gitignore
index 811143c074cdee41f6f3db8bf5c15623945eae1e..31613e011f511ef7ad9cdb25a5eab020a5fa36e0 100644 (file)
--- a/contrib/sepgsql/.gitignore
+++ b/contrib/sepgsql/.gitignore
@@ -3,3 +3,5 @@
 /sepgsql-regtest.if
 /sepgsql-regtest.pp
 /tmp
+# Generated subdirectories
+/results/

diff --git a/contrib/sepgsql/expected/dml.out b/contrib/sepgsql/expected/dml.out
index c1bbbba0093fe722596ec61860f3f76585f4b8bf..949789f2f1ab7661d76d21b5fe703c37e2f38d07 100644 (file)
--- a/contrib/sepgsql/expected/dml.out
+++ b/contrib/sepgsql/expected/dml.out
@@ -34,7 +34,8 @@ SECURITY LABEL ON FUNCTION customer_credit(int)
 SELECT objtype, objname, label FROM pg_seclabels
     WHERE provider = 'selinux'
      AND  objtype in ('table', 'column')
-     AND  objname in ('t1', 't2', 't3', 't4', 't5', 't5.e', 't5.f', 't5.g');
+     AND  objname in ('t1', 't2', 't3', 't4', 't5', 't5.e', 't5.f', 't5.g')
+ORDER BY objname;
  objtype | objname |                    label                    
 ---------+---------+---------------------------------------------
  table   | t1      | system_u:object_r:sepgsql_table_t:s0

diff --git a/contrib/sepgsql/sql/dml.sql b/contrib/sepgsql/sql/dml.sql
index 6fa1eb802e4c62da256de16e690f315b51411da8..94bf31a97af9bee8e9807bd7a48fa2b300332f1d 100644 (file)
--- a/contrib/sepgsql/sql/dml.sql
+++ b/contrib/sepgsql/sql/dml.sql
@@ -40,7 +40,8 @@ SECURITY LABEL ON FUNCTION customer_credit(int)
 SELECT objtype, objname, label FROM pg_seclabels
     WHERE provider = 'selinux'
      AND  objtype in ('table', 'column')
-     AND  objname in ('t1', 't2', 't3', 't4', 't5', 't5.e', 't5.f', 't5.g');
+     AND  objname in ('t1', 't2', 't3', 't4', 't5', 't5.e', 't5.f', 't5.g')
+ORDER BY objname;
 
 -- Hardwired Rules
 UPDATE pg_attribute SET attisdropped = true