Skip to content

Commit 84bc541

Browse files
rouaultrouault
committed
Travis / Vagrant: use PROJ 6.1.1 for PROJ.4 API testing as well
1 parent f595e91 commit 84bc541

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+321
-308
lines changed

‎ci/travis/script.sh‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,36 @@ set -eu
44
if [ "$BUILD_NAME" = "PHP_7.2_WITH_ASAN" ]; then
55
export CC="ccache clang"
66
export CXX="ccache clang++"
7+
else
8+
export CC="ccache gcc"
9+
export CXX="ccache g++"
10+
fi
11+
12+
curl http://download.osgeo.org/proj/proj-6.1.1.tar.gz > proj-6.1.1.tar.gz
13+
tar xzf proj-6.1.1.tar.gz
14+
mv proj-6.1.1 proj
15+
(cd proj/data && curl http://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz > proj-datumgrid-1.8.tar.gz && tar xvzf proj-datumgrid-1.8.tar.gz)
16+
(cd proj; CFLAGS='-O2 -DPROJ_RENAME_SYMBOLS' CXXFLAGS='-O2 -DPROJ_RENAME_SYMBOLS' ./configure --disable-static --prefix=/usr/local && CCACHE_CPP2=yes make -j2 && sudo make -j3 install)
17+
sudo rm -f /usr/include/proj_api.h
18+
19+
if [ "$BUILD_NAME" = "PHP_7.2_WITH_ASAN" ]; then
20+
# Force use of PROJ 4 API
21+
sudo rm /usr/local/include/proj.h
722
# -DNDEBUG to avoid issues with cairo cleanup
8-
make cmakebuild MFLAGS="-j2" CMAKE_C_FLAGS="-g -fsanitize=address -DNDEBUG" CMAKE_CXX_FLAGS="-g -fsanitize=address -DNDEBUG" EXTRA_CMAKEFLAGS="-DCMAKE_BUILD_TYPE=None -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address"
23+
make cmakebuild MFLAGS="-j2" CMAKE_C_FLAGS="-g -fsanitize=address -DNDEBUG -DPROJ_RENAME_SYMBOLS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" CMAKE_CXX_FLAGS="-g -fsanitize=address -DNDEBUG -DPROJ_RENAME_SYMBOLS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" EXTRA_CMAKEFLAGS="-DCMAKE_BUILD_TYPE=None -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address -DPROJ_INCLUDE_DIR=/usr/local/include -DPROJ_LIBRARY=/usr/local/lib/libproj.so.15"
924
export AUTOTEST_OPTS="-q -strict -run_under_asan"
1025
# Only run tests that only involve mapserv/shp2img binaries. mspython, etc would require LD_PREOLOAD'ing the asan shared object
1126
make -j4 asan_compatible_tests
1227
elif [ "$BUILD_NAME" = "PHP_7.3_WITH_PROJ6" ]; then
13-
curl http://download.osgeo.org/proj/proj-6.1.1.tar.gz > proj-6.1.1.tar.gz
14-
tar xzf proj-6.1.1.tar.gz
15-
mv proj-6.1.1 proj
16-
(cd proj/data && curl http://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz > proj-datumgrid-1.8.tar.gz && tar xvzf proj-datumgrid-1.8.tar.gz)
17-
(cd proj; CFLAGS='-O2 -DPROJ_RENAME_SYMBOLS' CXXFLAGS='-O2 -DPROJ_RENAME_SYMBOLS' ./configure --disable-static --prefix=/usr/local && CCACHE_CPP2=yes make -j2 && sudo make -j3 install)
28+
# Avoid any use of PROJ 4 API
1829
sudo rm -f /usr/include/proj_api.h
1930
make cmakebuild MFLAGS="-j2" CMAKE_C_FLAGS="-O2 -DPROJ_RENAME_SYMBOLS" CMAKE_CXX_FLAGS="-O2 -DPROJ_RENAME_SYMBOLS" EXTRA_CMAKEFLAGS="-DPROJ_INCLUDE_DIR=/usr/local/include -DPROJ_LIBRARY=/usr/local/lib/libproj.so.15"
20-
export LD_LIBRARY_PATH=/usr/local/lib
21-
./build/mapserv
2231
make mspython-wheel
2332
make -j4 test
2433
else
25-
export CC="ccache gcc"
26-
export CXX="ccache g++"
27-
make cmakebuild MFLAGS="-j2"
34+
# Force use of PROJ 4 API
35+
sudo rm /usr/local/include/proj.h
36+
make cmakebuild MFLAGS="-j2" CMAKE_C_FLAGS="-DPROJ_RENAME_SYMBOLS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" CMAKE_CXX_FLAGS="-DPROJ_RENAME_SYMBOLS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" EXTRA_CMAKEFLAGS="-DPROJ_INCLUDE_DIR=/usr/local/include -DPROJ_LIBRARY=/usr/local/lib/libproj.so.15"
2837
make mspython-wheel
2938
make -j4 test
3039
fi

‎msautotest/wxs/expected/ows_metadata_wcs_capabilities100.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ Content-Type: text/xml; charset=UTF-8
9393
<metadataLink metadataType="TC211" xlink:type="simple" xlink:href="http://localhost/ows?request=GetMetadata&amp;layer=toronto"/> <name>toronto</name>
9494
<label>Toronto</label>
9595
<lonLatEnvelope srsName="urn:ogc:def:crs:OGC:1.3:CRS84">
96-
<gml:pos>-117.54590357301 44.665615181923</gml:pos>
97-
<gml:pos>-117.38727661816 44.767083018813</gml:pos>
96+
<gml:pos>-117.54590357301 44.665615181929</gml:pos>
97+
<gml:pos>-117.38727661816 44.767083018819</gml:pos>
9898
</lonLatEnvelope>
9999
</CoverageOfferingBrief>
100100
</ContentMetadata>

‎msautotest/wxs/expected/ows_metadata_wcs_capabilities110.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ Content-Type: text/xml; charset=UTF-8
142142
<ows:Title>Toronto</ows:Title>
143143
<ows:Abstract>Toronto</ows:Abstract>
144144
<ows:WGS84BoundingBox dimensions="2">
145-
<ows:LowerCorner>-117.54590357301 44.665615181923</ows:LowerCorner>
146-
<ows:UpperCorner>-117.38727661816 44.767083018813</ows:UpperCorner>
145+
<ows:LowerCorner>-117.54590357301 44.665615181929</ows:LowerCorner>
146+
<ows:UpperCorner>-117.38727661816 44.767083018819</ows:UpperCorner>
147147
</ows:WGS84BoundingBox>
148148
<SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
149149
<SupportedFormat>image/tiff</SupportedFormat>

‎msautotest/wxs/expected/ows_wcs_capabilities.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Content-Type: text/xml; charset=UTF-8
7979
<name>grey</name>
8080
<label>Test label</label>
8181
<lonLatEnvelope srsName="urn:ogc:def:crs:OGC:1.3:CRS84">
82-
<gml:pos>-121.48874388968 0</gml:pos>
83-
<gml:pos>-121.48516027717 0.0027058261133485</gml:pos>
82+
<gml:pos>-121.4887438893 0</gml:pos>
83+
<gml:pos>-121.4851602768 0.0027058261133494</gml:pos>
8484
</lonLatEnvelope>
8585
<keywords>
8686
<keyword>test</keyword>

‎msautotest/wxs/expected/ows_wcs_describecoverage.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Content-Type: text/xml; charset=UTF-8
1414
<name>grey</name>
1515
<label>Test label</label>
1616
<lonLatEnvelope srsName="urn:ogc:def:crs:OGC:1.3:CRS84">
17-
<gml:pos>-121.48874388968 0</gml:pos>
18-
<gml:pos>-121.48516027717 0.0027058261133485</gml:pos>
17+
<gml:pos>-121.4887438893 0</gml:pos>
18+
<gml:pos>-121.4851602768 0.0027058261133494</gml:pos>
1919
</lonLatEnvelope>
2020
<keywords>
2121
<keyword>test</keyword>
@@ -24,8 +24,8 @@ Content-Type: text/xml; charset=UTF-8
2424
<domainSet>
2525
<spatialDomain>
2626
<gml:Envelope srsName="EPSG:4326">
27-
<gml:pos>-121.48874388968 0</gml:pos>
28-
<gml:pos>-121.48516027717 0.0027058261133485</gml:pos>
27+
<gml:pos>-121.4887438893 0</gml:pos>
28+
<gml:pos>-121.4851602768 0.0027058261133494</gml:pos>
2929
</gml:Envelope>
3030
<gml:Envelope srsName="EPSG:32611">
3131
<gml:pos>0 0</gml:pos>

‎msautotest/wxs/expected/wcs11_cap.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ Acquisition: 1999-10-11 18:47</ows:Abstract>
147147
</ows:Keywords>
148148
<ows:Metadata xlink:type="simple" xlink:href="http://www.gdal.org/metadata_test_link.html"/>
149149
<ows:WGS84BoundingBox dimensions="2">
150-
<ows:LowerCorner>-121.48874388968 0</ows:LowerCorner>
151-
<ows:UpperCorner>-121.48516027717 0.0027058261133485</ows:UpperCorner>
150+
<ows:LowerCorner>-121.4887438893 0</ows:LowerCorner>
151+
<ows:UpperCorner>-121.4851602768 0.0027058261133494</ows:UpperCorner>
152152
</ows:WGS84BoundingBox>
153153
<SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
154154
<SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>

‎msautotest/wxs/expected/wcs11_cap.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ Acquisition: 1999-10-11 18:47</ows:Abstract>
145145
</ows:Keywords>
146146
<ows:Metadata xlink:type="simple" xlink:href="http://www.gdal.org/metadata_test_link.html"/>
147147
<ows:WGS84BoundingBox dimensions="2">
148-
<ows:LowerCorner>-121.48874388968 0</ows:LowerCorner>
149-
<ows:UpperCorner>-121.48516027717 0.0027058261133485</ows:UpperCorner>
148+
<ows:LowerCorner>-121.4887438893 0</ows:LowerCorner>
149+
<ows:UpperCorner>-121.4851602768 0.0027058261133494</ows:UpperCorner>
150150
</ows:WGS84BoundingBox>
151151
<SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
152152
<SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>

‎msautotest/wxs/expected/wcs11_caps_section1.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ Acquisition: 1999-10-11 18:47</ows:Abstract>
105105
</ows:Keywords>
106106
<ows:Metadata xlink:type="simple" xlink:href="http://www.gdal.org/metadata_test_link.html"/>
107107
<ows:WGS84BoundingBox dimensions="2">
108-
<ows:LowerCorner>-121.488743889689 0</ows:LowerCorner>
109-
<ows:UpperCorner>-121.485160277178 0.00270582611334856</ows:UpperCorner>
108+
<ows:LowerCorner>-121.48874388937 0</ows:LowerCorner>
109+
<ows:UpperCorner>-121.48516027686 0.00270582611334944</ows:UpperCorner>
110110
</ows:WGS84BoundingBox>
111111
<SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
112112
<SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>

‎msautotest/wxs/expected/wcs11_caps_section3.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ Acquisition: 1999-10-11 18:47</ows:Abstract>
145145
</ows:Keywords>
146146
<ows:Metadata xlink:type="simple" xlink:href="http://www.gdal.org/metadata_test_link.html"/>
147147
<ows:WGS84BoundingBox dimensions="2">
148-
<ows:LowerCorner>-121.488743889689 0</ows:LowerCorner>
149-
<ows:UpperCorner>-121.485160277178 0.00270582611334856</ows:UpperCorner>
148+
<ows:LowerCorner>-121.48874388937 0</ows:LowerCorner>
149+
<ows:UpperCorner>-121.48516027686 0.00270582611334944</ows:UpperCorner>
150150
</ows:WGS84BoundingBox>
151151
<SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
152152
<SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>

‎msautotest/wxs/expected/wcs11_caps_updatesequence.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ Acquisition: 1999-10-11 18:47</ows:Abstract>
145145
</ows:Keywords>
146146
<ows:Metadata xlink:type="simple" xlink:href="http://www.gdal.org/metadata_test_link.html"/>
147147
<ows:WGS84BoundingBox dimensions="2">
148-
<ows:LowerCorner>-121.488743889689 0</ows:LowerCorner>
149-
<ows:UpperCorner>-121.485160277178 0.00270582611334856</ows:UpperCorner>
148+
<ows:LowerCorner>-121.48874388937 0</ows:LowerCorner>
149+
<ows:UpperCorner>-121.48516027686 0.00270582611334944</ows:UpperCorner>
150150
</ows:WGS84BoundingBox>
151151
<SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
152152
<SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>

0 commit comments

Comments
 (0)