fix tests and 3.1

Author: vincentsarago

.circleci/config.yml

@@ -12,14 +12,16 @@ common: &common
         name: create gdal docker image
         command: |
           docker build -f base/gdal${GDAL_VERSION}/Dockerfile -t gdal${GDAL_VERSION} .
+
+    - run:
+        name: test image
+        command: |
           docker run --name lambda --volume $(pwd)/:/local -itd gdal${GDAL_VERSION} bash
           test=$(docker exec -it lambda bash -c 'cd /local/tests && sh tests.sh')
-          docker cp ./scripts/create-lambda-layer.sh lambda:/tmp/create-lambda-layer.sh
-          docker exec -it lambda bash -c '/tmp/create-lambda-layer.sh'
           docker stop lambda
           docker rm lambda
           if [[ "$test" =~ "OK" ]]; then echo "PASSED"; else exit 1; fi
-    
+
     - run:
         name: create gdal layer
         command: |

base/gdal3.0/Dockerfile

@@ -206,7 +206,7 @@ RUN cd /tmp/gdal \
       --with-xml2 \
       --with-webp=$PREFIX \
       --with-zstd=$PREFIX \
-      --without-bsb \
+      --disable-driver-bsb \
       --without-cfitsio \
       --without-ecw \
       --without-fme \

base/gdal3.1/Dockerfile

@@ -180,9 +180,10 @@ RUN mkdir /tmp/gdal \
   && curl -sfL https://github.com/OSGeo/gdal/archive/master.tar.gz | tar zxf - -C /tmp/gdal --strip-components=2
   #&& curl -sfL https://github.com/OSGeo/gdal/archive/release/3.1.tar.gz | tar zxf - -C /tmp/gdal --strip-components=2
 
+
 RUN cd /tmp/gdal \
   && touch config.rpath \
-  && LDFLAGS="-Wl,-rpath,'\$\$ORIGIN'" CFLAGS="-O2 -Wl,-S" CXXFLAGS="-O2 -Wl,-S" ./configure \
+  && LIBXML2_CFLAGS=$(xml2-config --cflags) LIBXML2_LIBS=$(xml2-config --libs) LDFLAGS="-Wl,-rpath,'\$\$ORIGIN'" CFLAGS="-O2 -Wl,-S" CXXFLAGS="-O2 -Wl,-S" ./configure \
       --disable-debug \
       --enable-lto \
       --prefix=$PREFIX \
@@ -204,10 +205,10 @@ RUN cd /tmp/gdal \
       --with-png \
       --with-proj=$PREFIX \
       --with-sqlite3=$PREFIX \
-      --with-xml2 \
+      --with-xml2=yes \
       --with-webp=$PREFIX \
       --with-zstd=$PREFIX \
-      --without-bsb \
+      --disable-driver-bsb \
       --without-cfitsio \
       --without-ecw \
       --without-fme \

tests/tests.sh

@@ -4,7 +4,6 @@ version=$(gdal-config --version)
 echo Running tests for GDAL ${version}
 
 if [[ ! "$(gdal-config --prefix | grep $PREFIX)" ]]; then echo "NOK" && exit 1; fi
-if [[ ! "$(gdal-config --version | grep $GDALVERSION)" ]]; then echo "NOK" && exit 1; fi
 if [[ ! "$(gdal-config --formats | grep 'openjpeg')" ]]; then echo "openjpeg NOK" && exit 1; fi
 if [[ ! "$(gdal-config --formats | grep 'gtiff')" ]]; then echo "gtiff NOK" && exit 1; fi
 if [[ ! "$(gdal-config --formats | grep 'mbtiles')" ]]; then echo "mbtiles NOK" && exit 1; fi