fixup! meson: Add installcheck equivalent

ci-os-only: freebsd

Author: anarazel

.cirrus.yml

@@ -115,21 +115,26 @@ task:
   build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS}'
   upload_caches: ccache
 
-  test_world_script: |
+  # test runningcheck
+  test_running_script: |
     su postgres <<-EOF
+      set -e
       ulimit -c unlimited
-      meson test $MTEST_ARGS --num-processes ${TEST_JOBS}
+      meson test $MTEST_ARGS --quiet --suite setup
+      export LD_LIBRARY_PATH="$(pwd)/build/tmp_install/usr/local/lib/:$LD_LIBRARY_PATH"
+      mkdir build/testrun
+      build/tmp_install/usr/local/bin/initdb -N build/runningcheck --no-instructions -A trust
+      echo "include '$(pwd)/src/tools/ci/pg_ci_base.conf'" >> build/runningcheck/postgresql.conf
+      build/tmp_install/usr/local/bin/pg_ctl -c -o '-c fsync=off' -D build/runningcheck -l build/testrun/runningcheck.log start
+      meson test $MTEST_ARGS --num-processes ${TEST_JOBS} --setup running
+      build/tmp_install/usr/local/bin/pg_ctl -D build/runningcheck stop
     EOF
 
-  # test runningcheck
-  test_running_script: |
+  test_world_script: |
     su postgres <<-EOF
+      set -e
       ulimit -c unlimited
-      export LD_LIBRARY_PATH="$(pwd)/tmp_install/usr/local/lib/:$LD_LIBRARY_PATH"
-      tmp_install/usr/local/bin/initdb
-      tmp_install/usr/local/bin/pg_ctl -c -o '-c fsync=off' -D runningcheck -l testrun/runningcheck.log start
-      meson test $MTEST_ARGS --num-processes ${TEST_JOBS} --setup running
-      tmp_install/usr/local/bin/pg_ctl -D runningcheck -l testrun/runningcheck.log stop
+      meson test $MTEST_ARGS --num-processes ${TEST_JOBS}
     EOF
 
   on_failure: