]> granicus.if.org Git - postgis/commitdiff
Have regress install comments adn throw an error on failure (#1532)
authorSandro Santilli <strk@keybit.net>
Mon, 13 Feb 2012 10:58:35 +0000 (10:58 +0000)
committerSandro Santilli <strk@keybit.net>
Mon, 13 Feb 2012 10:58:35 +0000 (10:58 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@9164 b70326c6-7e19-0410-871a-916f4a2858ee

regress/run_test

index 062d7a2eed882eebf09a687afa7019b26cd7c328..3e3e281619db15330cab451c254080c55e6f581b 100755 (executable)
@@ -671,6 +671,9 @@ if test -z "$db_exists"; then
                object_count_pre=$(count_db_objects "counting object before postgis install")
 
                ${PSQL} ${_psql_opts} -Xf ${STAGED_SCRIPTS_DIR}/postgis.sql "${DB}" >> ${TMPDIR}/regress_log 2>&1 || init_db_error "core module"
+               if test -e ${STAGED_SCRIPTS_DIR}/postgis_comments.sql; then
+                       ${PSQL} ${_psql_opts} -Xf ${STAGED_SCRIPTS_DIR}/postgis_comments.sql "${DB}" >> ${TMPDIR}/regress_log 2>&1 || init_db_error "core comments"
+               fi
 
                if test x"$OPT_WITH_TOPO" = "xyes"; then
                        SCRIPT=${STAGED_SCRIPTS_DIR}/topology.sql
@@ -691,6 +694,9 @@ if test -z "$db_exists"; then
                                echo "${SCRIPT} not found" >&2
                                exit 1
                        fi
+                       if test -e ${STAGED_SCRIPTS_DIR}/raster_comments.sql; then
+                               ${PSQL} ${_psql_opts} -Xf ${STAGED_SCRIPTS_DIR}/raster_comments.sql "${DB}" >> ${TMPDIR}/regress_log 2>&1 || init_db_error "raster comments"
+                       fi
                fi
        else