Run uninstall test for raster, when enabled

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

diff --git a/regress/run_test b/regress/run_test
index 40972035693d02a2dc30f992d666ab852a20c7b9..2e4222a5a47ab4c811c7aff90082f3f4c99f058f 100755 (executable)
--- a/regress/run_test
+++ b/regress/run_test
@@ -705,26 +705,38 @@ done
 # (until they have an uninstall script themself)
 if test x"$OPT_DROP" = "xyes" \
      -a x"$OPT_WITH_TOPO" = "xno" \
-     -a x"$OPT_WITH_RASTER" = "xno" \
      -a x"$object_count_pre" != "x"
 then # {
 
   start_test "uninstall"
-
-  ${PSQL} ${_psql_opts} -Xf ${REGDIR}/../postgis/uninstall_postgis.sql "${DB}" \
-         > ${TMPDIR}/uninstall.log 2> ${TMPDIR}/uninstall.err
-  if [ $? -gt 0 ]; then # {
-    fail "uninstall_postgis.sql failed" "${TMPDIR}/uninstall.err"
-  else # }{
-
-    show_progress # on to objects count
-    object_count_post=$(count_db_objects "counting object after postgis uninstall")
-    if test ${object_count_pre} != ${object_count_post}; then # {
-          fail "Count of object before install (${object_count_pre}) != count after uninstall (${object_count_post})"
-    else
-          pass "(${object_count_pre})"
+  ok=yes
+
+  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
+    if [ $? -gt 0 ]; then # {
+      fail "uninstall_rtpostgis.sql failed" "${TMPDIR}/uninstall.err"
+      ok=no
+    fi # }
+    show_progress # on to postgis uninstall
+  fi
+
+  if test x"$ok" = "xyes"; then # {
+    ${PSQL} ${_psql_opts} -Xf ${REGDIR}/../postgis/uninstall_postgis.sql "${DB}" \
+           > ${TMPDIR}/uninstall.log 2> ${TMPDIR}/uninstall.err
+    if [ $? -gt 0 ]; then # {
+      fail "uninstall_postgis.sql failed" "${TMPDIR}/uninstall.err"
+    else # }{
+  
+      show_progress # on to objects count
+      object_count_post=$(count_db_objects "counting object after postgis uninstall")
+      if test ${object_count_pre} != ${object_count_post}; then # {
+            fail "Count of object before install (${object_count_pre}) != count after uninstall (${object_count_post})"
+      else
+            pass "(${object_count_pre})"
+      fi # }
+  
     fi # }
-
   fi # }
 
 fi # }