[postgis-tickets] r16160 - Force drop of regression database if it exists in debbie too

[Sandro Santilli]

Author: strk
Date: 2017-12-18 08:52:50 -0800 (Mon, 18 Dec 2017)
New Revision: 16160

Modified:
   trunk/ci/debbie/postgis_regress.sh
Log:
Force drop of regression database if it exists in debbie too

Or it keeps blaming me for this failure:
https://debbie.postgis.net/job/GDAL_PostGIS_Regress/5373/console

Modified: trunk/ci/debbie/postgis_regress.sh
===================================================================
--- trunk/ci/debbie/postgis_regress.sh	2017-12-18 14:54:00 UTC (rev 16159)
+++ trunk/ci/debbie/postgis_regress.sh	2017-12-18 16:52:50 UTC (rev 16160)
@@ -28,12 +28,14 @@
 rm -rf ${WORKSPACE}/tmp/${POSTGIS_MAJOR_VERSION}_${POSTGIS_MINOR_VERSION}_pg${PG_VER}w${OS_BUILD}
 #mkdir ${WORKSPACE}/tmp/
 export PGIS_REG_TMPDIR=${WORKSPACE}/tmp/${POSTGIS_MAJOR_VERSION}_${POSTGIS_MINOR_VERSION}_pg${PG_VER}w${OS_BUILD}
+export POSTGIS_REGRESS_DB="postgis_reg" # FIXME: tweak to avoid clashes
+psql -c "DROP DATABASE IF EXISTS $POSTGIS_REGRESS_DB"
 
 echo $PGPORT
 echo ${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
 
 ## doesn't work for some reason - just hard-code to branches for now
-# if [[ $POSTGIS_MICRO_VERSION  == *SVN* || $POSTGIS_MICRO_VERSION  == *dev*  ]]  
+# if [[ $POSTGIS_MICRO_VERSION  == *SVN* || $POSTGIS_MICRO_VERSION  == *dev*  ]]
 # then
 # 	export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
 # else
@@ -59,7 +61,7 @@
     --prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
 make clean
 ## install so we can later test extension upgrade
-make 
+make
 
 if [ "$?" != "0" ]; then
   exit $?