From dae0fa38abada8888617544b1085cc1f73c8a90a Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Thu, 5 Nov 2015 15:56:27 +0000 Subject: [PATCH] Rename tests and improve Makefile --- geocoder/extension/Makefile | 9 ++------- .../{cdb_geocoder_admin0_test.out => 10_admin0_test.out} | 0 .../{cdb_geocoder_admin1_test.out => 20_admin1_test.out} | 0 .../{cdb_geocoder_ipaddr_test.out => 30_ipaddr_test.out} | 0 ...oder_namedplaces_test.out => 40_namedplaces_test.out} | 0 ...ocoder_postalcode_test.out => 50_postalcode_test.out} | 0 .../{cdb_geocoder_admin0_test.sql => 10_admin0_test.sql} | 0 .../{cdb_geocoder_admin1_test.sql => 20_admin1_test.sql} | 0 .../{cdb_geocoder_ipaddr_test.sql => 30_ipaddr_test.sql} | 0 ...oder_namedplaces_test.sql => 40_namedplaces_test.sql} | 0 ...ocoder_postalcode_test.sql => 50_postalcode_test.sql} | 0 11 files changed, 2 insertions(+), 7 deletions(-) rename geocoder/extension/expected/{cdb_geocoder_admin0_test.out => 10_admin0_test.out} (100%) rename geocoder/extension/expected/{cdb_geocoder_admin1_test.out => 20_admin1_test.out} (100%) rename geocoder/extension/expected/{cdb_geocoder_ipaddr_test.out => 30_ipaddr_test.out} (100%) rename geocoder/extension/expected/{cdb_geocoder_namedplaces_test.out => 40_namedplaces_test.out} (100%) rename geocoder/extension/expected/{cdb_geocoder_postalcode_test.out => 50_postalcode_test.out} (100%) rename geocoder/extension/sql/{cdb_geocoder_admin0_test.sql => 10_admin0_test.sql} (100%) rename geocoder/extension/sql/{cdb_geocoder_admin1_test.sql => 20_admin1_test.sql} (100%) rename geocoder/extension/sql/{cdb_geocoder_ipaddr_test.sql => 30_ipaddr_test.sql} (100%) rename geocoder/extension/sql/{cdb_geocoder_namedplaces_test.sql => 40_namedplaces_test.sql} (100%) rename geocoder/extension/sql/{cdb_geocoder_postalcode_test.sql => 50_postalcode_test.sql} (100%) diff --git a/geocoder/extension/Makefile b/geocoder/extension/Makefile index f5ec3b8..f93f488 100644 --- 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 diff --git a/geocoder/extension/expected/cdb_geocoder_admin0_test.out b/geocoder/extension/expected/10_admin0_test.out similarity index 100% rename from geocoder/extension/expected/cdb_geocoder_admin0_test.out rename to geocoder/extension/expected/10_admin0_test.out diff --git a/geocoder/extension/expected/cdb_geocoder_admin1_test.out b/geocoder/extension/expected/20_admin1_test.out similarity index 100% rename from geocoder/extension/expected/cdb_geocoder_admin1_test.out rename to geocoder/extension/expected/20_admin1_test.out diff --git a/geocoder/extension/expected/cdb_geocoder_ipaddr_test.out b/geocoder/extension/expected/30_ipaddr_test.out similarity index 100% rename from geocoder/extension/expected/cdb_geocoder_ipaddr_test.out rename to geocoder/extension/expected/30_ipaddr_test.out diff --git a/geocoder/extension/expected/cdb_geocoder_namedplaces_test.out b/geocoder/extension/expected/40_namedplaces_test.out similarity index 100% rename from geocoder/extension/expected/cdb_geocoder_namedplaces_test.out rename to geocoder/extension/expected/40_namedplaces_test.out diff --git a/geocoder/extension/expected/cdb_geocoder_postalcode_test.out b/geocoder/extension/expected/50_postalcode_test.out similarity index 100% rename from geocoder/extension/expected/cdb_geocoder_postalcode_test.out rename to geocoder/extension/expected/50_postalcode_test.out diff --git a/geocoder/extension/sql/cdb_geocoder_admin0_test.sql b/geocoder/extension/sql/10_admin0_test.sql similarity index 100% rename from geocoder/extension/sql/cdb_geocoder_admin0_test.sql rename to geocoder/extension/sql/10_admin0_test.sql diff --git a/geocoder/extension/sql/cdb_geocoder_admin1_test.sql b/geocoder/extension/sql/20_admin1_test.sql similarity index 100% rename from geocoder/extension/sql/cdb_geocoder_admin1_test.sql rename to geocoder/extension/sql/20_admin1_test.sql diff --git a/geocoder/extension/sql/cdb_geocoder_ipaddr_test.sql b/geocoder/extension/sql/30_ipaddr_test.sql similarity index 100% rename from geocoder/extension/sql/cdb_geocoder_ipaddr_test.sql rename to geocoder/extension/sql/30_ipaddr_test.sql diff --git a/geocoder/extension/sql/cdb_geocoder_namedplaces_test.sql b/geocoder/extension/sql/40_namedplaces_test.sql similarity index 100% rename from geocoder/extension/sql/cdb_geocoder_namedplaces_test.sql rename to geocoder/extension/sql/40_namedplaces_test.sql diff --git a/geocoder/extension/sql/cdb_geocoder_postalcode_test.sql b/geocoder/extension/sql/50_postalcode_test.sql similarity index 100% rename from geocoder/extension/sql/cdb_geocoder_postalcode_test.sql rename to geocoder/extension/sql/50_postalcode_test.sql