Christoph Berg pushed to branch ci at Debian GIS Project / postgis
Commits: 74947911 by Christoph Berg at 2022-05-24T15:32:16+02:00 Run minimal regression tests from debian/tests/test-extension-creation. Running the full regression testsuite required too many hacks to get the Makefile machinery working when ./configure had not been run yet. - - - - - 1b22c7ba by Christoph Berg at 2022-05-24T15:33:04+02:00 debian/tests/control: Drop extra dependencies not needed anymore - - - - - 5 changed files: - debian/changelog - debian/clean - debian/tests/control - − debian/tests/regress - debian/tests/test-extension-creation Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +postgis (3.3.0~alpha1+dfsg-1~exp2) UNRELEASED; urgency=medium + + * Run minimal regression tests from debian/tests/test-extension-creation. + + -- Christoph Berg <[email protected]> Tue, 24 May 2022 14:49:47 +0200 + postgis (3.3.0~alpha1+dfsg-1~exp1) experimental; urgency=medium * New upstream alpha release. ===================================== debian/clean ===================================== @@ -1,3 +1,2 @@ -# created by debian/tests/regress -loader/pgsql2shp -loader/shp2pgsql +# created by debian/tests/test-extension-creation +regress_expected ===================================== debian/tests/control ===================================== @@ -1,3 +1,3 @@ -Depends: @, postgresql-server-dev-all, postgresql-all -Tests: test-extension-creation regress +Depends: @ +Tests: test-extension-creation Restrictions: allow-stderr, skippable ===================================== debian/tests/regress deleted ===================================== @@ -1,57 +0,0 @@ -#!/bin/sh - -set -eux - -# link shape loader/dumper to where the testsuite expects them -for prg in shp2pgsql pgsql2shp; do - test -x loader/$prg || ln -s /usr/bin/$prg loader/$prg -done - -# delete test directory before possibly switching user -rm -rf /tmp/pgis_reg - -# re-start ourselves as nobody since PG can't run as root -if [ "$(id -un)" = "root" ]; then - exec su nobody -s /bin/sh "$0" "$@" -fi - -# Skip tests on problematic architectures -ARCH="$(dpkg-architecture -qDEB_BUILD_ARCH)" - -if [ "${ARCH}" = "armel" ] || [ "${ARCH}" = "armhf" ] || [ "${ARCH}" = "mips" ] || [ "${ARCH}" = "mips64el" ] || [ "${ARCH}" = "mipsel" ] || [ "${ARCH}" = "s390x" ] || [ "${ARCH}" = "alpha" ] || [ "${ARCH}" = "hppa" ] || [ "${ARCH}" = "hurd-i386" ] || [ "${ARCH}" = "kfreebsd-i386" ] || [ "${ARCH}" = "powerpc" ] || [ "${ARCH}" = "ppc64" ] || [ "${ARCH}" = "sparc64" ]; then - echo "Skipping tests on problematic architectures" - exit 77 -fi - -# clean up on exit -trap "rm -rf /tmp/pgis_reg" EXIT - -# run the regression tests -for v in $(pg_buildext installed-versions); do - case $v in - *.*) POSTGIS_PGSQL_VERSION=$(echo $v | tr -d .) ;; - *) POSTGIS_PGSQL_VERSION="${v}0" ;; - esac - case $v in - *.*|10) HAVE_SPGIST=no ;; - *) HAVE_SPGIST=yes ;; - esac - pg_virtualenv -v $v <<-EOF - echo "### PostgreSQL $v ###" - set -eux - make -C regress/core -f Makefile.in check \ - PERL=perl \ - RUNTESTFLAGS="--extension --verbose" \ - POSTGIS_PGSQL_VERSION=$POSTGIS_PGSQL_VERSION \ - HAVE_SPGIST=$HAVE_SPGIST \ - top_srcdir=$PWD \ - builddir=$PWD/regress/core - make -C sfcgal/regress -f Makefile.in check \ - PERL=perl \ - RUNTESTFLAGS="--extension --verbose" \ - POSTGIS_PGSQL_VERSION=$POSTGIS_PGSQL_VERSION \ - HAVE_SFCGAL=yes \ - top_srcdir=$PWD \ - builddir=$PWD/sfcgal/regress - EOF -done ===================================== debian/tests/test-extension-creation ===================================== @@ -2,6 +2,9 @@ set -eu +export LANG=C.UTF-8 +unset LC_ALL LANGUAGE + # Skip tests on problematic architectures ARCH="$(dpkg-architecture -qDEB_BUILD_ARCH)" @@ -11,11 +14,14 @@ if [ "${ARCH}" = "armel" ] || [ "${ARCH}" = "armhf" ] || [ "${ARCH}" = "mips" ] fi for v in $(pg_buildext installed-versions); do - pg_virtualenv -v $v sh -e <<-'EOF' + pg_virtualenv -v $v sh -ex <<-'EOF' # test extension (fuzzystrmatch is part of postgresql-contrib and is needed by postgis_tiger_geocoder) for ext in postgis postgis_raster postgis_sfcgal fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do - psql -eXc "CREATE EXTENSION $ext" + psql -Xc "CREATE EXTENSION $ext" done + + psql -AXqt -vVERBOSITY=terse -vregdir=regress < regress/core/regress.sql > regress_expected 2>&1 + diff -u regress/core/regress_expected regress_expected EOF done View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/de25305cc688748b0c41b35000fb948cc0437b4b...1b22c7ba473a577ed9b48968f33022960656d8e5 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/de25305cc688748b0c41b35000fb948cc0437b4b...1b22c7ba473a577ed9b48968f33022960656d8e5 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
