Add ORDER BY to ensure platform-independent results in rules test.

diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index f77a532d6e2e7f4762a8e98468cea71051185395..c45ae0965109c05faf139bd8a16a084d3e4dd63d 100644 (file)
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -311,12 +311,12 @@ bm   |pluto
 (3 rows)
 
 QUERY: update rtest_person set pname = 'jwieck' where pdesc = 'Jan Wieck';
-QUERY: select * from rtest_admin;
+QUERY: select * from rtest_admin order by pname, sysname;
 pname |sysname
 ------+-------
 bm    |pluto  
-jwieck|orion  
 jwieck|notjw  
+jwieck|orion  
 (3 rows)
 
 QUERY: delete from rtest_system where sysname = 'orion';

diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql
index 8ffefd5be00fa8b22b70f6831c4a87300a209b18..433e07a3a909d6612fdbf30917d32dc3a2969bbb 100644 (file)
--- a/src/test/regress/sql/rules.sql
+++ b/src/test/regress/sql/rules.sql
@@ -251,7 +251,11 @@ select * from rtest_admin;
 
 update rtest_person set pname = 'jwieck' where pdesc = 'Jan Wieck';
 
-select * from rtest_admin;
+-- Note: use ORDER BY here to ensure consistent output across all systems.
+-- The above UPDATE affects two rows with equal keys, so they could be
+-- updated in either order depending on the whim of the local qsort().
+
+select * from rtest_admin order by pname, sysname;
 
 delete from rtest_system where sysname = 'orion';