add an tuples only unaligned include so don't have to worry about behavior of echo...

git-svn-id: http://svn.osgeo.org/postgis/trunk@14042 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 7e70a35b6b7c8be4fbc066dda53ea3e5d05e78af..46d8345eaa6d0c5ec79248d407c486c675a924fd 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -42,24 +42,21 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        mkdir -p expected
        cp $< $@
 
-## adding \t .. to force output to be the same as what get in regular regress in tiger folder
-
 
-expected/test-normalize_address.out: ../../extras/tiger_geocoder/regress/normalize_address_regress
-       echo '\t on \a \set ECHO none' > $@
-       cat $^ >> $@
+expected/test-normalize_address.out: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/normalize_address_regress
+       cat $^ > $@
        
-expected/test-pagc_normalize_address.out: ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress
-       echo '\t on \a \set ECHO none' > $@
-       cat $^ >> $@
+expected/test-pagc_normalize_address.out: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress
+       cat $^ > $@
        
-sql/test-normalize_address.sql: ../../extras/tiger_geocoder/regress/normalize_address_regress.sql
-       echo '\t on \a \set ECHO none' > $@
-       cat $^ >> $@
+## adding \t .. to force output to be the same as what get in regular regress in tiger folder
+sql/test-normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/normalize_address_regress.sql
+       mkdir -p sql
+       cat $^ > $@
        
-sql/test-pagc_normalize_address.sql: ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
-       echo '\t on \a \set ECHO none' > $@
-       cat $^ >> $@
+sql/test-pagc_normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
+       mkdir -p sql
+       cat $^ > $@
        
 sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql  sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql
        mkdir -p sql
@@ -70,9 +67,6 @@ sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_hel
        mkdir -p sql
        cat $^ > $@
 
-sql/test_normalize_address.sql: ../../extras/tiger_geocoder/regress/normalize_address_regress.sql
-       echo '\a' > $@
-       cat $^ >> $@
 
 sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
        mkdir -p sql

diff --git a/extensions/postgis_tiger_geocoder/sql_bits/test_tuples_only_unaligned.sql.in b/extensions/postgis_tiger_geocoder/sql_bits/test_tuples_only_unaligned.sql.in
new file mode 100644 (file)
index 0000000..eb78379
--- /dev/null
+++ b/extensions/postgis_tiger_geocoder/sql_bits/test_tuples_only_unaligned.sql.in
@@ -0,0 +1 @@
+\t on \a \set ECHO none\r