From cd0801b817c0e7895f7a6b4e1bdce96352ec5e0a Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 18 Dec 2017 16:52:50 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.osgeo.org/postgis/trunk@16160 b70326c6-7e19-0410-871a-916f4a2858ee --- ci/debbie/postgis_regress.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/debbie/postgis_regress.sh b/ci/debbie/postgis_regress.sh index 7f24db8b2..fd3542b6a 100644 --- a/ci/debbie/postgis_regress.sh +++ b/ci/debbie/postgis_regress.sh @@ -28,12 +28,14 @@ rm -rf ${WORKSPACE}/tmp/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION} 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 @@ fi --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 $? -- 2.40.0