Get 'make test' working again, both with HEALPix and without

Author: esabol

Makefile

@@ -134,6 +134,10 @@ else
 endif
 
 test: pg_sphere.test.sql sql/init_test.sql
+	cp expected/init_test.out.in expected/init_test.out
+ifneq ($(USE_HEALPIX),0)
+	cat expected/init_test_healpix.out.in >> expected/init_test.out
+endif
 	$(pg_regress_installcheck) $(PGS_TMP_DIR) $(REGRESS_OPTS) $(TESTS)
 
 pg_sphere.test.sql: $(RELEASE_SQL) $(shlib)

expected/init_test.out renamed to expected/init_test.out.in

@@ -24,14 +24,12 @@ psql:pg_sphere.test.sql:159: NOTICE:  argument type spath is only a shell
 psql:pg_sphere.test.sql:178: NOTICE:  type "sbox" is not yet defined
 DETAIL:  Creating a shell type definition.
 psql:pg_sphere.test.sql:185: NOTICE:  argument type sbox is only a shell
-psql:pg_sphere.test.sql:8541: NOTICE:  type "spherekey" is not yet defined
+psql:pg_sphere.test.sql:8540: NOTICE:  type "spherekey" is not yet defined
 DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:8548: NOTICE:  argument type spherekey is only a shell
-psql:pg_sphere.test.sql:8562: NOTICE:  type "pointkey" is not yet defined
+psql:pg_sphere.test.sql:8547: NOTICE:  argument type spherekey is only a shell
+psql:pg_sphere.test.sql:8561: NOTICE:  type "pointkey" is not yet defined
 DETAIL:  Creating a shell type definition.
-psql:pg_sphere.test.sql:8569: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8575: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8581: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:8587: NOTICE:  argument type pointkey is only a shell
-psql:pg_sphere.test.sql:9154: NOTICE:  return type smoc is only a shell
-psql:pg_sphere.test.sql:9160: NOTICE:  argument type smoc is only a shell
+psql:pg_sphere.test.sql:8568: NOTICE:  argument type pointkey is only a shell
+psql:pg_sphere.test.sql:8574: NOTICE:  argument type pointkey is only a shell
+psql:pg_sphere.test.sql:8580: NOTICE:  argument type pointkey is only a shell
+psql:pg_sphere.test.sql:8586: NOTICE:  argument type pointkey is only a shell

expected/init_test_healpix.out.in

@@ -0,0 +1,2 @@
+psql:pg_sphere.test.sql:9153: NOTICE:  return type smoc is only a shell
+psql:pg_sphere.test.sql:9159: NOTICE:  argument type smoc is only a shell