Skip to content

Commit

Permalink
Merge pull request MapServer#7110 from geographika/gif-driver
Browse files Browse the repository at this point in the history
Set GDAL_DRIVER_PATH on Windows for the GIF driver
  • Loading branch information
rouault authored Jul 12, 2024
2 parents 15eb094 + 6773985 commit b31d612
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
4 changes: 3 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ build_script:
- cd %BUILD_FOLDER%/build
# set the MapScript custom environment variable for python 3.8+
- set MAPSERVER_DLL_PATH=%BUILD_FOLDER%/build/Release;%SDK_BIN%
- set PROJ_LIB=%SDK_BIN%/proj9/SHARE
- set PROJ_DATA=%SDK_BIN%/proj9/SHARE
# ensure the GIF driver is available for tests
- set GDAL_DRIVER_PATH=%SDK_BIN%/gdal/plugins
# check the mapserver exe can run
- mapserv -v
- cmake --build . --target pythonmapscript-wheel --config Release
Expand Down
12 changes: 6 additions & 6 deletions msautotest/mspython/test_rq.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,10 @@ def test_rq_9():
# Open a classified map and post a point query.


@pytest.mark.xfail(
"APPVEYOR" in os.environ, reason="fail for unknown reason on AppVeyor builds"
)
def test_rq_10():
"""
This test requires the GIF driver to be available in GDAL, by setting GDAL_DRIVER_PATH
"""

map = mapscript.mapObj(get_relpath_to_this("../gdal/classtest1.map"))
layer = map.getLayer(0)
Expand Down Expand Up @@ -455,10 +455,10 @@ def test_rq_10():
# Issue another point query, on colored text.


@pytest.mark.xfail(
"APPVEYOR" in os.environ, reason="fail for unknown reason on AppVeyor builds"
)
def test_rqtest_12():
"""
This test requires the GIF driver to be available in GDAL, by setting GDAL_DRIVER_PATH
"""

map = mapscript.mapObj(get_relpath_to_this("../gdal/classtest1.map"))
layer = map.getLayer(0)
Expand Down

0 comments on commit b31d612

Please sign in to comment.