Some fixes after review

vitcpp · Nov 5, 2024 · 0a5d8f9 · 0a5d8f9
1 parent f0b0557
commit 0a5d8f9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/build-and-check-windows-latest.yml b/.github/workflows/build-and-check-windows-latest.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pg_version: [10, 11, 12, 13, 14, 15, 16, 17]
+        pg_version: [10]
         use_healpix: [0]
 
     name: PostgreSQL ${{ matrix.pg_version }} - USE_HEALPIX=${{ matrix.use_healpix }} (windows-latest)
@@ -64,11 +64,29 @@ jobs:
         make --keep-going -j$(nproc) PROFILE='-Werror -Wall' USE_HEALPIX=0
         make USE_HEALPIX=0 install
 
-    - name: Test pgSphere
+    - name: Test (installcheck)
       run: |
         initdb -D pgdata -U postgres
         pg_ctl -D pgdata -l postgres.log start
         make USE_HEALPIX=0 installcheck
+        pg_ctl -D pgdata -l postgres.log stop
+        rm -rf pgdata
+
+    - name: Show installcheck regression.diffs
+      if: ${{ failure() }}
+      run: cat regression.diffs
+
+    - name: Test (crushtest)
+      run: |
+        initdb -D pgdata -U postgres
+        pg_ctl -D pgdata -l postgres.log start
+        make USE_HEALPIX=0 crushtest
+        pg_ctl -D pgdata -l postgres.log stop
+        rm -rf pgdata
+
+    - name: Show crushtest regression.diffs
+      if: ${{ failure() }}
+      run: cat regression.diffs
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4

diff --git a/expected/init_extended.out b/expected/init_extended.out
@@ -1,18 +1,18 @@
 -- indexed operations.....
 -- spoint_data and scircle_data tables have to be created and indexed using
-\! testsuite/gen_point.pl 1 > results/gen_point_1.sql
+\! 'testsuite/gen_point.pl' 1 > results/gen_point_1.sql
 \i results/gen_point_1.sql
 CREATE TABLE spoint_data (sp spoint);
 COPY spoint_data (sp) FROM stdin;
 CREATE INDEX sp_idx ON spoint_data USING gist (sp);
 -- and
-\! testsuite/gen_circle.pl 1 0.1 > results/gen_circle_1_0.1.sql
+\! 'testsuite/gen_circle.pl' 1 0.1 > results/gen_circle_1_0.1.sql
 \i results/gen_circle_1_0.1.sql
 CREATE TABLE scircle_data (sc scircle);
 COPY scircle_data (sc) FROM stdin;
 CREATE INDEX sc_idx ON scircle_data USING gist (sc);
 --
-\! testsuite/gen_poly.pl 1 0.1 4 > results/gen_poly_1_0.1_4.sql
+\! 'testsuite/gen_poly.pl' 1 0.1 4 > results/gen_poly_1_0.1_4.sql
 \i results/gen_poly_1_0.1_4.sql
 CREATE TABLE spoly_data (sp spoly);
 COPY spoly_data (sp) FROM stdin;

diff --git a/sql/init_extended.sql b/sql/init_extended.sql
@@ -2,15 +2,15 @@
 
 -- spoint_data and scircle_data tables have to be created and indexed using
 
-\! testsuite/gen_point.pl 1 > results/gen_point_1.sql
+\! 'testsuite/gen_point.pl' 1 > results/gen_point_1.sql
 \i results/gen_point_1.sql
 
 -- and
 
-\! testsuite/gen_circle.pl 1 0.1 > results/gen_circle_1_0.1.sql
+\! 'testsuite/gen_circle.pl' 1 0.1 > results/gen_circle_1_0.1.sql
 \i results/gen_circle_1_0.1.sql
 
 --
 
-\! testsuite/gen_poly.pl 1 0.1 4 > results/gen_poly_1_0.1_4.sql
+\! 'testsuite/gen_poly.pl' 1 0.1 4 > results/gen_poly_1_0.1_4.sql
 \i results/gen_poly_1_0.1_4.sql