From 87d967f70f4866c17404f6a9b8062f892ed31e08 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Wed, 2 Feb 2011 23:46:51 -0500 Subject: [PATCH] Minor sepgsql regression test fixes. --- contrib/sepgsql/.gitignore | 2 ++ contrib/sepgsql/expected/dml.out | 3 ++- contrib/sepgsql/sql/dml.sql | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/sepgsql/.gitignore b/contrib/sepgsql/.gitignore index 811143c074..31613e011f 100644 --- 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 c1bbbba009..949789f2f1 100644 --- 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 6fa1eb802e..94bf31a97a 100644 --- 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 -- 2.40.0