From 4f90e57fa1cac7afdd57e5f649775cb24aa15612 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 1 Dec 2023 08:23:20 +0100 Subject: [PATCH] Fix test failure with PROJ 9.3.1. Closes: #104 --- https://github.com/OSGeo/libgeotiff/pull/105 test/testlistgeo | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/testlistgeo b/test/testlistgeo index 48e92eb..4331cc3 100755 --- a/test/testlistgeo +++ b/test/testlistgeo @@ -218,6 +218,11 @@ echo "" >>${OUT} sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp mv ${OUT}.tmp ${OUT} +sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/g" < ${OUT} > ${OUT}.tmp +mv ${OUT}.tmp ${OUT} +sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < ${OUT} > ${OUT}.tmp +mv ${OUT}.tmp ${OUT} + sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp @@ -230,6 +235,11 @@ mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized +sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp +mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized +sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp +mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + # do 'diff' with distribution results # after cleaning for avoid spurios result due # to different build dir 13f6be2705080745ae7dd50&showmsg=1'>root/gnu/tests/vnc.scm
AgeCommit message (Collapse)Author
2023-07-19tests: xvnc: Fix 'gdm auto-suspend is disabled' test.Maxim Cournoyer
This failure is another collateral from commit a09c7da ("tests: Fork and exec a new Guile for the marionette REPL."), which isolated the marionette evaluation environment from that of the host. * gnu/tests/vnc.scm (run-xvnc-test): Move the (guix build utils) import to... ["gdm auto-suspend is disabled"]: ... inside the marionette-eval of this test. Complete comment. Reported-by: Bruno Victal <mirai@makinata.eu>
2023-07-19tests: xvnc: Group up GDM test and use GNU Ocrad instead of Tesseract.Bruno Victal
* gnu/tests/vnc.scm (run-xvnc-test): Group up GDM test. Use GNU Ocrad. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-10-07tests: xvnc: Do not use specification->package in OS definition.Maxim Cournoyer
Doing so would cause the extra package dependencies to not be correctly registered as dependencies, which would lead to a silent failure when attempting to load or byte compile the module at the time guix build itself (e.g., when running 'guix pull'). * gnu/tests/vnc.scm (%xvnc-os) [packages]: Turn the the specification->package declaration into a list of package objects.
2022-10-07Revert "Revert "services: Add xvnc-service-type.""Maxim Cournoyer
This reverts commit 0c4966160054bc50e6ab3a4ac9c9a6a1826ab5a0. The fix appears in the subsequent commit, for clarity.
2022-10-07Revert "services: Add xvnc-service-type."Maxim Cournoyer
This reverts commit 1c528a95cb92b7808e6603d7956185005583629f. This broke 'guix pull', for (yet) unknown reasons.
2022-10-07services: Add xvnc-service-type.Maxim Cournoyer
* gnu/services/vnc.scm: New file. * gnu/tests/vnc.scm: Likewise. * gnu/local.mk: Register them.