Bas Couwenberg pushed to branch experimental at Debian GIS Project / postgis
Commits: 8eb0afd6 by Bas Couwenberg at 2021-09-28T12:10:30+02:00 Add upstream patch to fix not re-entrant loader tests. - - - - - 3 changed files: - debian/changelog - + debian/patches/0001-run_test.pl-avoid-loader-test-failure-breaking-subse.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -2,6 +2,7 @@ postgis (3.2.0~alpha1+dfsg-1~exp3) UNRELEASED; urgency=medium * Drop mr58.patch, did not fix FTBFS on i386. * Add new upstream patch to possibly fix FTBFS on i386. + * Add upstream patch to fix not re-entrant loader tests. -- Bas Couwenberg <[email protected]> Mon, 27 Sep 2021 10:59:50 +0200 ===================================== debian/patches/0001-run_test.pl-avoid-loader-test-failure-breaking-subse.patch ===================================== @@ -0,0 +1,68 @@ +Description: run_test.pl: avoid loader test failure breaking subsequent tests + Still keeps the loadedshp table on failure if --nodrop is given +Author: Sandro Santilli <[email protected]> +Origin: https://trac.osgeo.org/postgis/changeset/016b9115eb87b3d3b46e009d8e78aa873a829890/git +Bug: https://trac.osgeo.org/postgis/ticket/4995 + +--- a/regress/run_test.pl ++++ b/regress/run_test.pl +@@ -1053,6 +1053,7 @@ sub run_loader_test + # If we have some expected files to compare with, run in wkt mode. + if ( ! run_loader_and_check_output("wkt test", $tblname, "${TEST}-w.sql.expected", "${TEST}-w.select.expected", "-w $custom_opts") ) + { ++ drop_table($tblname) unless $OPT_NODROP; + return 0; + } + drop_table($tblname); +@@ -1060,11 +1061,13 @@ sub run_loader_test + # If we have some expected files to compare with, run in geography mode. + if ( ! run_loader_and_check_output("geog test", $tblname, "${TEST}-G.sql.expected", "${TEST}-G.select.expected", "-G $custom_opts") ) + { ++ drop_table($tblname) unless $OPT_NODROP; + return 0; + } + # If we have some expected files to compare with, run the dumper and compare shape files. + if ( ! run_dumper_and_check_output("dumper geog test", $tblname, "${TEST}-G.shp.expected") ) + { ++ drop_table($tblname) unless $OPT_NODROP; + return 0; + } + drop_table($tblname); +@@ -1072,11 +1075,13 @@ sub run_loader_test + # Always run in wkb ("normal") mode, even if there are no expected files to compare with. + if( ! run_loader_and_check_output("wkb test", $tblname, "${TEST}.sql.expected", "${TEST}.select.expected", "$custom_opts", "true") ) + { ++ drop_table($tblname) unless $OPT_NODROP; + return 0; + } + # If we have some expected files to compare with, run the dumper and compare shape files. + if( ! run_dumper_and_check_output("dumper wkb test", $tblname, "${TEST}.shp.expected") ) + { ++ drop_table($tblname) unless $OPT_NODROP; + return 0; + } + drop_table($tblname); +@@ -1087,6 +1092,7 @@ sub run_loader_test + # If we have some expected files to compare with, run in wkt dump mode. + if ( ! run_loader_and_check_output("wkt dump test", $tblname, "${TEST}-wD.sql.expected") ) + { ++ drop_table($tblname) unless $OPT_NODROP; + return 0; + } + drop_table($tblname); +@@ -1094,6 +1100,7 @@ sub run_loader_test + # If we have some expected files to compare with, run in wkt dump mode. + if ( ! run_loader_and_check_output("geog dump test", $tblname, "${TEST}-GD.sql.expected") ) + { ++ drop_table($tblname) unless $OPT_NODROP; + return 0; + } + drop_table($tblname); +@@ -1101,6 +1108,7 @@ sub run_loader_test + # If we have some expected files to compare with, run in wkb dump mode. + if ( ! run_loader_and_check_output("wkb dump test", $tblname, "${TEST}-D.sql.expected") ) + { ++ drop_table($tblname) unless $OPT_NODROP; + return 0; + } + drop_table($tblname); ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ chaikin incorrect-path-for-interpreter.patch lwgeom_topo.patch mr59.patch +0001-run_test.pl-avoid-loader-test-failure-breaking-subse.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/8eb0afd6b3311e045074007792e758ca1a6ed5a7 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/8eb0afd6b3311e045074007792e758ca1a6ed5a7 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
