Merge pull request #3106 from rouault/update_nkg_gie

nkg.gie: update results due to OSGeo/PROJ-data#79
OSGeo · Mar 9, 2022 · e082c6f · e082c6f
1 parent b68b8cd
commit e082c6f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -45,7 +45,8 @@ jobs:
         run: |
             set VCPKG_INSTALLED=c:\vcpkg\installed\${{ env.ARCH }}-windows
             dir %VCPKG_INSTALLED%\bin
-            set PATH=%VCPKG_INSTALLED%\bin;%PATH%
+            dir %VCPKG_INSTALLED%\tools
+            set PATH=%VCPKG_INSTALLED%\bin;%VCPKG_INSTALLED%\tools;%PATH%
             set PROJ_BUILD=%GITHUB_WORKSPACE%\build
             mkdir %PROJ_BUILD%
             cd %PROJ_BUILD%

diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake
@@ -39,6 +39,7 @@ endfunction()
 
 # Create user writable directory for tests
 add_custom_target(create_tmp_user_writable_dir ALL
+                  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJ_BINARY_DIR}/tmp_user_writable_dir
                   COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJ_BINARY_DIR}/tmp_user_writable_dir)
 
 function(proj_add_gie_network_dependent_test TESTNAME TESTCASE)

diff --git a/test/gie/nkg.gie b/test/gie/nkg.gie
@@ -208,15 +208,15 @@ tolerance   0.1 mm
 
 # STAS
 accept      3275753.4135 321111.2481 5445042.2134 2020.0
-expect      3275753.9111 321110.8658 5445041.8822 2020.0
+expect      3275753.9094 321110.8626 5445041.8818 2020.0
 
 # BOD3
 accept      2391773.9918 615615.1837 5860966.1279 2020.0
-expect      2391774.5535 615614.9100 5860965.8138 2020.0
+expect      2391774.5481 615614.9063 5860965.8185 2020.0
 
 # KAUS
 accept      2107888.9134 895603.4769 5933242.6269 2020.0
-expect      2107889.5097 895603.2085 5933242.3152 2020.0
+expect      2107889.5014 895603.2055 5933242.3208 2020.0
 
 
 # -------------------------------------------------------------------------------