From: Sandro Santilli <strk@keybit.net>
Date: Wed, 22 Oct 2014 16:08:41 +0000 (+0000)
Subject: Allow running "make garden" over an existing "postgis_garden" database
X-Git-Tag: 2.2.0rc1~747
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c0f58622df7c6ace4065c6928105aea73fa20b1;p=postgis

Allow running "make garden" over an existing "postgis_garden" database

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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index b2c403df5..3bbada71c 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -221,10 +221,10 @@ test check: staged-install
 	$(PERL) run_test.pl --upgrade $(RUNTESTFLAGS) $(SFCGALTESTFLAGS) $(TESTS)
 
 garden:
-	createdb postgis_garden
-	createlang plpgsql postgis_garden || true # tolerate an error here
-	psql -d postgis_garden < ../postgis/postgis.sql
-	psql -d postgis_garden < ../spatial_ref_sys.sql
+	createdb postgis_garden && \
+	createlang plpgsql postgis_garden && \
+	psql -d postgis_garden < ../postgis/postgis.sql && \
+	psql -d postgis_garden < ../spatial_ref_sys.sql || true # tolerate an error here
 	@echo '-------------------------------------------------'
 	@echo 'Regression tests in progress (it will take time)'
 	@echo 'Result output: ./regress/postgis_garden_result.txt'