[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-506-ga16cf9a
git at osgeo.org
git at osgeo.org
Fri Sep 10 09:40:30 PDT 2021
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via a16cf9a97fc63a3b96cddb6e4895a074feba5664 (commit)
from d77e8b01b6d485d8e2564c96b438ec31790a3f02 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a16cf9a97fc63a3b96cddb6e4895a074feba5664
Author: Regina Obe <lr at pcorp.us>
Date: Fri Sep 10 12:39:46 2021 -0400
Remove ci/reallie and regress/real
All performance tests are now in
https://git.osgeo.org/gitea/postgis/postgis-performance
diff --git a/ci/reallie/pg_init_start.sh b/ci/reallie/pg_init_start.sh
deleted file mode 100644
index 34088b2..0000000
--- a/ci/reallie/pg_init_start.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-# Reallie is a 64-bit Debian 11, residing in same host as debbie
-# She will be used for testing real data tests (those in real folder)
-# This is script to launch custom compiled PostgreSQL
-# export label=reallie #this is passed in via Jenkins
-export WORKSPACE=/home/jenkins/workspace
-
-export OS_BUILD=64
-export PG_VER=14
-export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
-export PGPORT=55432
-export PGDATA=$PGPATH/data_${PGPORT}
-export PGLOG="$PGDATA/pgsql.log"
-# What to use to start up the postmaster
-DAEMON="$PGPATH/bin/pg_ctl -D $PGDATA -o '-F' -l logfile start"
-
-# What to use to shut down the postmaster
-PGCTL="$PGPATH/bin/pg_ctl"
-
-# remove cluster if exists
-if [ -d $PGDATA ] ; then
- if [ -d $PGDATA/postmaster.pid ] ; then
- $PGCTL stop -D $PGDATA -s -m fast
- fi;
-
- rm -rf $PGDATA
-fi;
-
-#initialize cluster
-$PGPATH/bin/initdb
-
-echo -n "Starting PostgreSQL: "
-$DAEMON &
-#sleep a bit because sometimes postgres takes a bit to start up
-sleep 20
-echo "ok"
-exit 0
diff --git a/ci/reallie/postgis_regress.sh b/ci/reallie/postgis_regress.sh
deleted file mode 100644
index 7907d75..0000000
--- a/ci/reallie/postgis_regress.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# Reallie is a 64-bit Debian 11, residing in same host as debbie
-## BRANCH is passed in via jenkins which is set via gitea web hook
-#export BRANCH=618a67b1d6fc223dd5a4c0b02c824939f21dbd65
-## label is set by jenkins
-#export label=${label}
-
-## TODO: Determine what will trigger reallie to move
-
-export WORKSPACE=/home/jenkins/workspace
-export DOWNLOAD_DATADIR=${WORKSPACE}/download_data
-cd ${WORKSPACE}/PostGIS_Worker_Run/label/${label}/$BRANCH
-export OS_BUILD=64
-export PG_VER=14
-export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-
-export PATH=${PGPATH}/bin:${PGPATH}/lib:${PATH}
-export PGPORT=55432
-export PGDATA=$PGPATH/data_${PGPORT}
-export PGHOST=localhost
-
-sh autogen.sh
-./configure --with-pgconfig=${PGPATH}/bin/pg_config
-#make clean
-make
-export err_status=0
-make install
-cd regress/real
-make check
-err_status=$?
-
-
-if [ -d $PGDATA/postmaster.pid ] ; then
- $PGCTL stop -D $PGDATA -s -m fast
-fi
-exit $err_status
diff --git a/regress/real/Makefile.in b/regress/real/Makefile.in
deleted file mode 100644
index 16f032c..0000000
--- a/regress/real/Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-DATABASE=postgis_reg
-PERL=@PERL@
-
-# MingW hack: rather than use PGSQL_BINDIR directly, we change to the directory and
-# then use "pwd" to return the path. This ensures that the returned path is in MSYS
-# format, otherwise colons in drive letters will break PATH.
-PGSQL_BINDIR=$(shell cd "@PGSQL_BINDIR@" && pwd)
-
-ifndef DOWNLOAD_DATADIR
- DOWNLOAD_DATADIR=$(srcdir)/download_data
-endif
-
-#
-# Put path from pg_config into front of search path
-#
-PATH := $(PGSQL_BINDIR):$(PATH)
-export PATH
-
-all:
- @echo "Use 'make check' to run all tests"
-
-download_data:
- sh download_data.sh
-
-%.sql: %.sql.in
- $(PERL) -lpe "s'@DOWNLOAD_DATADIR@'$(DOWNLOAD_DATADIR)'g" $< > $@
-
-clean:
- rm -f load_data.sql
-
-distclean: clean
- rm -rf $(DOWNLOAD_DATADIR)
-
-check-regress-deps: download_data load_data.sql
-check-regress: check-regress-deps
-
-topsrcdir = $(realpath ../../)
-srcdir = $(realpath .)
-
-include tests.mk
-
-include ../runtest.mk
-
-check: check-regress
diff --git a/regress/real/README b/regress/real/README
deleted file mode 100644
index bd7d96a..0000000
--- a/regress/real/README
+++ /dev/null
@@ -1,76 +0,0 @@
-The real folder is the home for tests involving real world data.
-To run these tests:
-cd regress/real
-make check
-
-It includes a download_data.sh script that downloads data from http://postgis.net/extra/test-data
-
-Data in http://postgis.net/extra/test-data is currently sourced from Census Tiger and OSM data sources and is packaged
-in a format suitable for load by psql.
-
-If you want to control where the data is downloaded to, set env variable
-export DOWNLOAD_DATADIR=/path/to_download_data
-
-If path is not set, a download_data folder will created in this folder and removed with make distclean
-
-The data sources available there are as follows:
-
-tiger_national.sql.bz2 - this requires the postgis_tiger_geocoder extension to be loaded before hand as it inherits from the tables packaged with that. The data is from https://www2.census.gov/geo/tiger/TIGER2020/ (zcta5, state, county)
-
-tiger_dc.sql.bz2 - this requires the postgis_tiger_geocoder extension. Data sourced from https://www2.census.gov/geo/tiger/TIGER2020/*/tl_2020_11*_*.zip files
-
-tiger_ma.sql.bz2 - this requires the postgis_tiger_geocoder extension. Data sourced from https://www2.census.gov/geo/tiger/TIGER2020/*/tl_2020_25*_*.zip files
-
-osm_belarus.sql.bz2 - this is sourced from https://download.geofabrik.de/europe/belarus-latest.osm.pbf dated 2021-06-28T20:21:42Z
-
-osm_china.sql.bz2 - this is sourced from https://download.geofabrik.de/asia/china-140101-free.shp.zip dated 2018-05-03 16:26
-
-Requirements for run_test.pl
-----------------------------
-
-run_test.pl requires the following Perl modules to be installed
-
- Text::Diff;
- File::Which;
- File::Basename;
- File::Temp 'tempdir';
- File::Copy;
- File::Path 'make_path';
- File::Path 'remove_tree';
- Cwd 'abs_path';
- Getopt::Long;
-
-Most distributions of Perl will have everything except Text::Diff and File::Which.
-To install them from the command-line, as root run
-
- cpan Text::Diff
- cpan File::Which
-
-
-How to add a regression test
-----------------------------
-
-1. Add any needed data sources to download_data.sh (later we might break this up)
-2. Add a psql load line to load_data.sql script and edit tests.mk and add the script RUNTESTFLAGS_INTERNAL
-3. Write a <testname>.sql file with data and sql queries for testing
-4. Write a <testname>_expected or <testname>_expected.in file with
- expected results per query
- The expected results provided in the <testname>_expected file must be
- formatted using the following psql options:
- -a -- unaligned columns
- -f | -- use | (pipe) as the field separator between columns
- -t -- output rows only, ie. no table header
-
- cat file.sql | psql -F\| -t -A > file_expected
-
-3. Edit tests.mk adding <testname> to the TESTS variable.
- Any _expected.in files need to be added to the PREPROC variable.
-
-Optional:
- If your test has unusual setup or teardown requirements, you may create
- any of the following optional files (they will run in this order):
- <testname>-pre.sh
- <testname>-pre.sql (run via psql)
- (The test itself is run here.)
- <testname>-post.sql (run via psql)
- <testname>-post.sh
diff --git a/regress/real/download_data.sh b/regress/real/download_data.sh
deleted file mode 100644
index 5274873..0000000
--- a/regress/real/download_data.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-export TESTSITE="http://postgis.net/extra/test-data"
-if [ -z "$DOWNLOAD_DATADIR" ]; then
- DOWNLOAD_DATADIR=$(dirname "$0")/download_data
-fi
-
-mkdir -p $DOWNLOAD_DATADIR
-cd $DOWNLOAD_DATADIR
-echo $DOWNLOAD_DATADIR
-
-wget -nc ${TESTSITE}/tiger_national.sql.bz2 -O tiger_national.sql.bz2
-wget -nc ${TESTSITE}/tiger_dc.sql.bz2 -O tiger_dc.sql.bz2
-wget -nc ${TESTSITE}/osm_china.sql.bz2 -O osm_china.sql.bz2
-wget -nc ${TESTSITE}/osm_belarus.sql.bz2 -O osm_belarus.sql.bz2
-bzip2 -dk tiger_national.sql.bz2
-bzip2 -dk tiger_dc.sql.bz2
-bzip2 -dk osm_china.sql.bz2
-bzip2 -dk osm_belarus.sql.bz2
-echo "Done downloading data"
-export DOWNLOAD_DATADIR
diff --git a/regress/real/drop_data.sql b/regress/real/drop_data.sql
deleted file mode 100644
index 23953ec..0000000
--- a/regress/real/drop_data.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DROP SCHEMA osm_china CASCADE;
-DROP SCHEMA tiger_data CASCADE;
-DROP SCHEMA osm_belarus CASCADE;
-CREATE SCHEMA tiger_data;
diff --git a/regress/real/index_tiger_data.sql b/regress/real/index_tiger_data.sql
deleted file mode 100644
index 9211182..0000000
--- a/regress/real/index_tiger_data.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-set search_path=public,postgis,tiger,contrib,topology;
-SELECT tiger.install_missing_indexes();
diff --git a/regress/real/index_tiger_data_expected b/regress/real/index_tiger_data_expected
deleted file mode 100644
index 718f4d2..0000000
--- a/regress/real/index_tiger_data_expected
+++ /dev/null
@@ -1 +0,0 @@
-t
diff --git a/regress/real/load_data.sql.in b/regress/real/load_data.sql.in
deleted file mode 100644
index 019bede..0000000
--- a/regress/real/load_data.sql.in
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE tiger.zcta5 DROP CONSTRAINT IF EXISTS enforce_geotype_the_geom;
-\i @DOWNLOAD_DATADIR@/tiger_national.sql
-\i @DOWNLOAD_DATADIR@/tiger_dc.sql
-\i @DOWNLOAD_DATADIR@/osm_china.sql
-\i @DOWNLOAD_DATADIR@/osm_belarus.sql
diff --git a/regress/real/tests.mk b/regress/real/tests.mk
deleted file mode 100644
index 7f82b1d..0000000
--- a/regress/real/tests.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# **********************************************************************
-# *
-# * PostGIS - Spatial Types for PostgreSQL
-# * http://postgis.net
-# *
-# * Copyright (C) 2021 Regina Obe <lr at pcorp.us>
-# *
-# * This is free software; you can redistribute and/or modify it under
-# * the terms of the GNU General Public Licence. See the COPYING file.
-# *
-# **********************************************************************
-
-override RUNTESTFLAGS := $(RUNTESTFLAGS) --tiger --extension
-
-RUNTESTFLAGS_INTERNAL += \
- --after-create-script $(topsrcdir)/regress/real/load_data.sql \
- --before-uninstall-script $(topsrcdir)/regress/real/drop_data.sql
-
-TESTS += \
- $(topsrcdir)/regress/real/index_tiger_data
-----------------------------------------------------------------------
Summary of changes:
ci/reallie/pg_init_start.sh | 37 -----------------
ci/reallie/postgis_regress.sh | 36 ----------------
regress/real/Makefile.in | 44 --------------------
regress/real/README | 76 ----------------------------------
regress/real/download_data.sh | 20 ---------
regress/real/drop_data.sql | 4 --
regress/real/index_tiger_data.sql | 2 -
regress/real/index_tiger_data_expected | 1 -
regress/real/load_data.sql.in | 5 ---
regress/real/tests.mk | 20 ---------
10 files changed, 245 deletions(-)
delete mode 100644 ci/reallie/pg_init_start.sh
delete mode 100644 ci/reallie/postgis_regress.sh
delete mode 100644 regress/real/Makefile.in
delete mode 100644 regress/real/README
delete mode 100644 regress/real/download_data.sh
delete mode 100644 regress/real/drop_data.sql
delete mode 100644 regress/real/index_tiger_data.sql
delete mode 100644 regress/real/index_tiger_data_expected
delete mode 100644 regress/real/load_data.sql.in
delete mode 100644 regress/real/tests.mk
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list