From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 4 Sep 2019 16:11:37 +0200 Subject: [PATCH 1/2] Adapt test script for PROJ 6.2 EPSG database (fixes #22) --- libgeotiff/test/testlistgeo | 8 +++++++- libgeotiff/test/testlistgeo_out.dist | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libgeotiff/test/testlistgeo b/libgeotiff/test/testlistgeo index 7fb4a2f..571f5d0 100755 --- a/test/testlistgeo +++ b/test/testlistgeo @@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> ${OUT} $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT} echo "" >>${OUT} +# Normalize for results depending on the exact version of PROJ / EPSG database +sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp +mv ${OUT}.tmp ${OUT} + +sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp # do 'diff' with distribution results echo "diff ${OUT} with testlistgeo_out.dist" -diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist +diff -u ${OUT} testlistgeo_out.dist.tmp if [ $? -ne 0 ] ; then echo "" echo "PROBLEMS HAVE OCCURRED" @@ -224,6 +229,7 @@ else echo "TEST OK" echo "test file ${OUT} removed" echo + rm testlistgeo_out.dist.tmp /bin/rm -f ${OUT} exit 0 fi diff --git a/libgeotiff/test/testlistgeo_out.dist b/libgeotiff/test/testlistgeo_out.dist index 68a948c..c157f00 100644 --- a/test/testlistgeo_out.dist +++ b/test/testlistgeo_out.dist @@ -1738,11 +1738,11 @@ Geotiff_Information: Keyed_Information: GTModelTypeGeoKey (Short,1): ModelTypeProjected GTRasterTypeGeoKey (Short,1): RasterPixelIsArea - ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe) + ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA Europe) End_Of_Keys. End_Of_Geotiff. -PCS = 3035 (ETRS89 / LAEA Europe) +PCS = 3035 (ETRS89-extended / LAEA Europe) Projection = 19986 (Europe Equal Area 2001) Projection Method: CT_LambertAzimEqualArea ProjCenterLatGeoKey: 52.000000 ( 52d 0' 0.00"N) From 15af10648c4cb7b4c55cbe08caaf9884c1d156d9 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 4 Sep 2019 19:13:11 +0200 Subject: [PATCH 2/2] appveyor.yml: build vcpkg from source to fix issue with VS2015 eCommit message (Expand)Author 2021-09-26tests: Reduce boilerplate for users of 'system-test-runner'....* gnu/tests/audio.scm, gnu/tests/base.scm, gnu/tests/ci.scm, gnu/tests/cups.scm, gnu/tests/databases.scm, gnu/tests/desktop.scm, gnu/tests/dict.scm, gnu/tests/docker.scm, gnu/tests/file-sharing.scm, gnu/tests/ganeti.scm, gnu/tests/guix.scm, gnu/tests/ldap.scm, gnu/tests/linux-modules.scm, gnu/tests/mail.scm, gnu/tests/messaging.scm, gnu/tests/monitoring.scm, gnu/tests/networking.scm, gnu/tests/nfs.scm, gnu/tests/package-management.scm, gnu/tests/reconfigure.scm, gnu/tests/rsync.scm, gnu/tests/security-token.scm, gnu/tests/singularity.scm, gnu/tests/ssh.scm, gnu/tests/telephony.scm, gnu/tests/version-control.scm, gnu/tests/virtualization.scm, gnu/tests/web.scm: Remove (mkdir #$output) (chdir #$output) and pass #$output as argument to 'system-test-runner'. Ludovic Courtès 2021-09-25tests: Adjust to SRFI-64 as found in Guile 3.0.7....In Guile 3.0.7, 'test-runner-current' is set to #f upon 'test-end'. Consequently, the previous strategy, where we'd call 'test-runner-current' after 'test-end', no longer works. Instead, set the test runner in each test right before 'test-begin'. * gnu/build/marionette.scm (system-test-runner): New procedure. * gnu/tests/audio.scm (run-mpd-test): Replace (exit (= ...)) idiom by (test-runner-current (system-test-runner)). * gnu/tests/base.scm (run-basic-test) (run-cleanup-test, run-mcron-test, run-nss-mdns-test): Likewise. * gnu/tests/ci.scm (run-laminar-test): Likewise. * gnu/tests/cups.scm (run-cups-test): Likewise. * gnu/tests/databases.scm (run-memcached-test) (run-postgresql-test, run-mysql-test): Likewise. * gnu/tests/desktop.scm (run-elogind-test): Likewise. * gnu/tests/dict.scm (run-dicod-test): Likewise. * gnu/tests/docker.scm (run-docker-test): Likewise. (run-docker-system-test): Likewise. * gnu/tests/file-sharing.scm (run-transmission-daemon-test): Likewise. * gnu/tests/ganeti.scm (run-ganeti-test): Likewise. * gnu/tests/guix.scm (run-guix-build-coordinator-test): Likewise. (run-guix-data-service-test): Likewise. * gnu/tests/ldap.scm (run-ldap-test): Likewise. * gnu/tests/linux-modules.scm (run-loadable-kernel-modules-test-base): Likewise. * gnu/tests/mail.scm (run-opensmtpd-test) (run-exim-test, run-dovecot-test, run-getmail-test): Likewise. * gnu/tests/messaging.scm (run-xmpp-test) (run-bitlbee-test, run-quassel-test): Likewise. * gnu/tests/monitoring.scm (run-prometheus-node-exporter-server-test) (run-zabbix-server-test): Likewise. * gnu/tests/networking.scm (run-inetd-test, run-openvswitch-test) (run-dhcpd-test, run-tor-test, run-iptables-test, run-ipfs-test): Likewise. * gnu/tests/nfs.scm (run-nfs-test) (run-nfs-server-test, run-nfs-root-fs-test): Likewise. * gnu/tests/package-management.scm (run-nix-test): Likewise. * gnu/tests/reconfigure.scm (run-switch-to-system-test) (run-upgrade-services-test, run-install-bootloader-test): Likewise. * gnu/tests/rsync.scm (run-rsync-test): Likewise. * gnu/tests/security-token.scm (run-pcscd-test): Likewise. * gnu/tests/singularity.scm (run-singularity-test): Likewise. * gnu/tests/ssh.scm (run-ssh-test): Likewise. * gnu/tests/telephony.scm (run-jami-test): Likewise. * gnu/tests/version-control.scm (run-cgit-test): Likewise. (run-git-http-test, run-gitolite-test, run-gitile-test): Likewise. * gnu/tests/virtualization.scm (run-libvirt-test, run-childhurd-test): Likewise. * gnu/tests/web.scm (run-webserver-test, run-php-fpm-test) (run-hpcguix-web-server-test, run-tailon-test, run-patchwork-test): Likewise. Ludovic Courtès 2020-03-02gnu: Add system test for CUPS....* gnu/tests/cups.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. Marius Bakke