From: Sandro Santilli <strk@keybit.net>
Date: Sat, 24 Dec 2011 11:21:45 +0000 (+0000)
Subject: Enable uninstall_topology.sql testing
X-Git-Tag: 2.0.0alpha1~315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a746c89707c7bc3e700321de9b4c09a11acba99;p=postgis

Enable uninstall_topology.sql testing

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

diff --git a/regress/run_test b/regress/run_test
index cf36e2bee..c2c4483bd 100755
--- a/regress/run_test
+++ b/regress/run_test
@@ -700,13 +700,22 @@ done
 # and nobody requested raster or topology
 # (until they have an uninstall script themself)
 if test x"$OPT_DROP" = "xyes" \
-     -a x"$OPT_WITH_TOPO" = "xno" \
      -a x"$object_count_pre" != "x"
 then # {
 
   start_test "uninstall"
   ok=yes
 
+  if test x"$OPT_WITH_TOPO" = "xyes"; then
+    ${PSQL} ${_psql_opts} -Xf ${REGDIR}/../topology/uninstall_topology.sql "${DB}" \
+           > ${TMPDIR}/uninstall.log 2> ${TMPDIR}/uninstall.err
+    if [ $? -gt 0 ]; then # {
+      fail "uninstall_topology.sql failed" "${TMPDIR}/uninstall.err"
+      ok=no
+    fi # }
+    show_progress # on to raster uninstall
+  fi
+
   if test x"$OPT_WITH_RASTER" = "xyes"; then
     ${PSQL} ${_psql_opts} -Xf ${REGDIR}/../raster/rt_pg/uninstall_rtpostgis.sql "${DB}" \
            > ${TMPDIR}/uninstall.log 2> ${TMPDIR}/uninstall.err