pg_stat_statements: Rework test order

The test "squashing" was the last item of the REGRESS list, but
"cleanup" should be the second to last, dropping the extension.
"oldextversions" is the last item.

In passing, the REGRESS list is cleaned up to include one item per line,
so as diffs are minimized when adding new test files.

Noticed while playing with this area of the code.

Reviewed-by: Álvaro Herrera <alvherre@kurilemu.de>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Reviewed-by: Man Zeng <zengman@halodbtech.com>
Discussion: https://postgr.es/m/aW6_Xc8auuu5iAPi@paquier.xyz

contrib/pg_stat_statements/Makefile

@@ -19,9 +19,25 @@ PGFILEDESC = "pg_stat_statements - execution statistics of SQL statements"
 LDFLAGS_SL += $(filter -lm, $(LIBS))
 
 REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/pg_stat_statements/pg_stat_statements.conf
-REGRESS = select dml cursors utility level_tracking planning \
-	user_activity wal entry_timestamp privileges extended \
-	parallel plancache cleanup oldextversions squashing
+
+# Note: Test "cleanup" is kept second to last, removing the extension.
+REGRESS = \
+	select \
+	dml \
+	cursors \
+	utility \
+	level_tracking \
+	planning \
+	user_activity \
+	wal entry_timestamp \
+	privileges \
+	extended \
+	parallel \
+	plancache \
+	squashing \
+	cleanup \
+	oldextversions
+
 # Disabled because these tests require "shared_preload_libraries=pg_stat_statements",
 # which typical installcheck users do not have (e.g. buildfarm clients).
 NO_INSTALLCHECK = 1

contrib/pg_stat_statements/expected/squashing.out

@@ -1,7 +1,6 @@
 --
 -- Const squashing functionality
 --
-CREATE EXTENSION pg_stat_statements;
 --
 -- Simple Lists
 --

contrib/pg_stat_statements/meson.build

@@ -37,6 +37,7 @@ install_data(
   kwargs: contrib_data_args,
 )
 
+# Note: Test "cleanup" is kept second to last, removing the extension.
 tests += {
   'name': 'pg_stat_statements',
   'sd': meson.current_source_dir(),
@@ -56,9 +57,9 @@ tests += {
       'extended',
       'parallel',
       'plancache',
+      'squashing',
       'cleanup',
       'oldextversions',
-      'squashing',
     ],
     'regress_args': ['--temp-config', files('pg_stat_statements.conf')],
     # Disabled because these tests require

contrib/pg_stat_statements/sql/squashing.sql

@@ -1,7 +1,6 @@
 --
 -- Const squashing functionality
 --
-CREATE EXTENSION pg_stat_statements;
 
 --
 -- Simple Lists