]> granicus.if.org Git - postgis/commitdiff
Enable uninstall_topology.sql testing
authorSandro Santilli <strk@keybit.net>
Sat, 24 Dec 2011 11:21:45 +0000 (11:21 +0000)
committerSandro Santilli <strk@keybit.net>
Sat, 24 Dec 2011 11:21:45 +0000 (11:21 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@8560 b70326c6-7e19-0410-871a-916f4a2858ee

regress/run_test

index cf36e2bee0f91dce2d34517d6f771ceef515f2d2..c2c4483bd8ba1d55105d94260563c98f97791973 100755 (executable)
@@ -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