Rename tests and improve Makefile

2015-11-05 15:56:27 +00:00
parent 016e5af85a
commit dae0fa38ab
11 changed files with 2 additions and 7 deletions
--- a/geocoder/extension/Makefile
+++ b/geocoder/extension/Makefile
@@ -4,13 +4,8 @@ EXTENSION = cdb_geocoder
 EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")

 DATA = $(EXTENSION)--$(EXTVERSION).sql
-REGRESS = \
-  00_install_test \
-  cdb_geocoder_admin0_test \
-  cdb_geocoder_admin1_test \
-  cdb_geocoder_ipaddr_test \
-  cdb_geocoder_namedplaces_test \
-  cdb_geocoder_postalcode_test
+
+REGRESS = $(notdir $(basename $(wildcard sql/*test.sql)))

 # postgres build stuff
 PG_CONFIG = pg_config
--- a/geocoder/extension/expected/cdb_geocoder_admin0_test.out
+++ b/geocoder/extension/expected/cdb_geocoder_admin0_test.out
--- a/geocoder/extension/expected/cdb_geocoder_admin1_test.out
+++ b/geocoder/extension/expected/cdb_geocoder_admin1_test.out
--- a/geocoder/extension/expected/cdb_geocoder_ipaddr_test.out
+++ b/geocoder/extension/expected/cdb_geocoder_ipaddr_test.out
--- a/geocoder/extension/expected/cdb_geocoder_namedplaces_test.out
+++ b/geocoder/extension/expected/cdb_geocoder_namedplaces_test.out
--- a/geocoder/extension/expected/cdb_geocoder_postalcode_test.out
+++ b/geocoder/extension/expected/cdb_geocoder_postalcode_test.out
--- a/geocoder/extension/sql/cdb_geocoder_admin0_test.sql
+++ b/geocoder/extension/sql/cdb_geocoder_admin0_test.sql
--- a/geocoder/extension/sql/cdb_geocoder_admin1_test.sql
+++ b/geocoder/extension/sql/cdb_geocoder_admin1_test.sql
--- a/geocoder/extension/sql/cdb_geocoder_ipaddr_test.sql
+++ b/geocoder/extension/sql/cdb_geocoder_ipaddr_test.sql
--- a/geocoder/extension/sql/cdb_geocoder_namedplaces_test.sql
+++ b/geocoder/extension/sql/cdb_geocoder_namedplaces_test.sql
--- a/geocoder/extension/sql/cdb_geocoder_postalcode_test.sql
+++ b/geocoder/extension/sql/cdb_geocoder_postalcode_test.sql