Merge commit 'a372cbf5821302ebaf757235b29ba812df78204d'

Author: Sibras

.gitignore

@@ -13,7 +13,6 @@
 /runtest
 /runxmlconf
 /testModule
-/testThreads
 /testapi
 /testchar
 /testdict
@@ -22,7 +21,6 @@
 /testrecurse
 
 # Tests
-/dba100000.xml
 /missing.lst
 /runsuite.log
 /runxmlconf.log
@@ -32,7 +30,6 @@
 # Generated by build system
 /config.h
 /include/libxml/xmlversion.h
-/libxml-2.0-uninstalled.pc
 /libxml-2.0.pc
 /libxml2-config.cmake
 /xml2-config

.gitlab-ci.yml

@@ -2,16 +2,16 @@ include:
   - component: "gitlab.gnome.org/GNOME/citemplates/release-service@master"
     inputs:
       dist-job-name: "dist"
-      tarball-artifact-path: "libxml2-dist/libxml2-2.13.7.tar.xz"
+      tarball-artifact-path: "libxml2-dist/libxml2-2.14.0.tar.xz"
 
 .test:
   image: registry.gitlab.gnome.org/gnome/libxml2
   variables:
-    BASE_CONFIG: "--with-ftp --with-legacy --with-xptr-locs"
+    BASE_CONFIG: "--with-http --with-lzma --with-zlib"
   before_script:
     - rm -rf libxml2-build
     - mkdir libxml2-build
-    - ln -s /tests/xmlconf libxml2-build
+    - ln -s /tests/xmlconf .
   script:
     - sh .gitlab-ci/test.sh
 
@@ -24,7 +24,7 @@ gcc:c89:
   extends: .test
   variables:
     CONFIG: "--without-python"
-    CFLAGS: "-O2 -std=c89 -D_XOPEN_SOURCE=600"
+    CFLAGS: "-O2 -std=c89 -D_XOPEN_SOURCE=600 -Wno-error=unused-function"
 
 gcc:minimum:
   extends: .test
@@ -36,7 +36,7 @@ gcc:medium:
   extends: .test
   variables:
     BASE_CONFIG: "--with-minimum"
-    CONFIG: "--with-threads --with-tree --with-xpath --with-output --with-html"
+    CONFIG: "--with-threads --with-tree --with-xpath --with-output --with-html --with-iso8859x --with-valid"
     CFLAGS: "-O2"
 
 gcc:legacy:
@@ -78,7 +78,7 @@ clang:msan:
   tags:
     - win32-ps
   variables:
-    BASE_CONFIG: "--with-ftp --with-legacy --with-xptr-locs"
+    BASE_CONFIG: "--with-http --with-lzma --with-zlib"
     # Disabled for now, see #658
     CONFIG: "--without-python"
     CHERE_INVOKING: "yes"
@@ -90,7 +90,7 @@ clang:msan:
   cache:
     key: "$MSYSTEM"
     paths:
-      - libxml2-build/xmlconf/
+      - xmlconf/
 
 mingw:w64-x86_64:shared:
   extends: .mingw
@@ -118,7 +118,7 @@ mingw:w64-i686:shared:
   before_script:
     - rm -rf libxml2-build
     - mkdir libxml2-build
-    - ln -s /tests/xmlconf libxml2-build
+    - ln -s /tests/xmlconf .
   script:
     - sh .gitlab-ci/test_cmake.sh
   artifacts:
@@ -173,7 +173,7 @@ cmake:linux:clang:static:
   cache:
     key: "$MSYSTEM"
     paths:
-      - libxml2-build/xmlconf/
+      - xmlconf/
   artifacts:
     paths:
       - libxml2-$Env:CI_COMMIT_SHORT_SHA-$Env:SUFFIX.tar.gz
@@ -190,15 +190,17 @@ cmake:mingw:w64-i686:shared:
 
 cmake:mingw:w64-i686:static:
   extends: .cmake:mingw
-  only:
-    - schedules
+#  only:
+#    - schedules
   variables:
     BUILD_SHARED_LIBS: "OFF"
     MSYSTEM: MINGW32
     SUFFIX: mingw-w64-i686-static
 
 cmake:mingw:w64-x86_64:shared:
   extends: .cmake:mingw
+#  only:
+#    - schedules
   variables:
     BUILD_SHARED_LIBS: "ON"
     MSYSTEM: MINGW64
@@ -227,7 +229,7 @@ cmake:mingw:w64-x86_64:static:
     key: "msvc"
     paths:
       - cmake-$Env:CMAKE_VERSION-win64-x64/
-      - libxml2-build/xmlconf/
+      - xmlconf/
       - 7za.exe
   artifacts:
     paths:
@@ -282,6 +284,8 @@ cmake:msvc:v141:x86:static:
 
 meson:
   image: registry.gitlab.gnome.org/gnome/libxml2
+  before_script:
+    - ln -s /tests/xmlconf .
   script:
     - sh .gitlab-ci/test_meson.sh
 
@@ -312,3 +316,24 @@ pages:
       - public/devhelp/*.xsl
   only:
     - master@GNOME/libxml2
+
+downstream-lxml:
+  image: registry.gitlab.gnome.org/gnome/libxml2
+  script:
+    - sh .gitlab-ci/downstream-lxml.sh
+
+downstream-nokogiri:
+  # owner: @flavorjones
+  image: ghcr.io/sparklemotion/nokogiri-test:upstream-libxml
+  script:
+    - .gitlab-ci/downstream-nokogiri.sh
+
+downstream-perl:
+  image: registry.gitlab.gnome.org/gnome/libxml2
+  script:
+    - sh .gitlab-ci/downstream-perl.sh
+
+downstream-php:
+  image: registry.gitlab.gnome.org/gnome/libxml2
+  script:
+    - sh .gitlab-ci/downstream-php.sh

.gitlab-ci/Dockerfile

@@ -1,7 +1,14 @@
-# The image is also used for libxslt, that's why we need git and
-# libgcrypt-dev.
+# The image is also used for libxslt.
+#
+# package           required for
+# ------------------------------------------------------------
+# libclang-rt-dev   sanitizer runtimes
+# llvm              llvm-symbolizer (for sanitizer backtraces)
+# git               libxslt
+# libgcrypt-dev     libxslt
+# xz-utils          make dist
 
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     apt-get upgrade -y && \
@@ -11,6 +18,31 @@ RUN apt-get update && \
         make gcc clang llvm libclang-rt-dev \
         zlib1g-dev liblzma-dev libgcrypt-dev \
         python3-dev \
-        cmake meson
+        cmake meson \
+        xz-utils
 WORKDIR /tests
 RUN curl https://www.w3.org/XML/Test/xmlts20080827.tar.gz |tar xz
+
+# XML::LibXML uses Alien::Libxml2 which has a huge dependency chain.
+# We try to install most dependencies with apt. We also require
+# libxml2-dev to stop Alien::Libxml2 from downloading and building
+# libxml2 on its own.
+RUN apt-get install -y --no-install-recommends \
+        libperl-dev libxml2-dev cpanminus \
+        libalien-build-perl \
+        libio-socket-ssl-perl \
+        libsort-versions-perl \
+        liburi-perl \
+        libxml-namespacesupport-perl  \
+        libxml-sax-perl \
+        libyaml-perl
+RUN cpanm -n Alien::Libxml2
+RUN apt-get remove -y libxml2-dev
+
+# PHP
+RUN apt-get install -y --no-install-recommends \
+        bison re2c libsqlite3-dev
+
+# lxml
+RUN apt-get install -y --no-install-recommends \
+        cython3

.gitlab-ci/Test-Msvc.ps1

@@ -1,25 +1,18 @@
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
-if (-not (Test-Path cmake-$Env:CMAKE_VERSION-win64-x64)) {
-    Invoke-WebRequest `
-        -Uri http://github.com/Kitware/CMake/releases/download/v$Env:CMAKE_VERSION/cmake-$Env:CMAKE_VERSION-win64-x64.zip `
-        -OutFile cmake-$Env:CMAKE_VERSION-win64-x64.zip
-    Expand-Archive cmake-$Env:CMAKE_VERSION-win64-x64.zip -DestinationPath .
-}
-$Env:Path="$Env:CI_PROJECT_DIR\cmake-$Env:CMAKE_VERSION-win64-x64\bin;$Env:Path"
-
 if (-not (Test-Path 7za.exe)) {
     Invoke-WebRequest `
         -Uri https://www.7-zip.org/a/7z1900-extra.7z `
         -OutFile 7z1900-extra.7z
     cmake -E tar xf 7z1900-extra.7z 7za.exe
 }
 
-if (-not (Test-Path libxml2-build/xmlconf)) {
+if (-not (Test-Path xmlconf)) {
     Invoke-WebRequest `
         -Uri https://www.w3.org/XML/Test/xmlts20080827.tar.gz `
         -OutFile xmlts20080827.tar.gz ;
-    .\7za.exe x xmlts20080827.tar.gz -olibxml2-build
+    .\7za.exe x xmlts20080827.tar.gz
+    .\7za.exe x xmlts20080827.tar
 }
 
 cmake `

.gitlab-ci/downstream-lxml.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+srcdir=$(pwd)
+
+mkdir -p install
+installdir="$srcdir/install"
+export PKG_CONFIG_PATH="$installdir/lib/pkgconfig"
+
+sh autogen.sh "--prefix=$installdir" --with-http --with-zlib --without-python
+make -j$(nproc)
+make install
+
+git clone --depth 1 https://gitlab.gnome.org/GNOME/libxslt.git
+cd libxslt
+sh autogen.sh \
+    "--prefix=$installdir" \
+    "--with-libxml-prefix=$installdir" \
+    --without-python
+make -j$(nproc)
+make install
+cd ..
+
+git clone --depth 1 https://github.com/lxml/lxml.git
+cd lxml
+make
+LD_LIBRARY_PATH="$installdir/lib" make TESTFLAGS='' test

.gitlab-ci/downstream-nokogiri.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+export LIBXML_DIR=$(pwd)
+export MAKEFLAGS=-j$(nproc)
+export NOCONFIGURE=1
+./autogen.sh
+
+git clone https://github.com/sparklemotion/nokogiri
+cd nokogiri
+bundle install
+bundle exec rake compile -- --with-xml2-source-dir=${LIBXML_DIR}
+bundle exec rake test

.gitlab-ci/downstream-perl.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+sh autogen.sh --without-python
+make -j$(nproc)
+
+srcdir=$(pwd)
+incdir=$srcdir/include
+libdir=$srcdir/.libs
+
+git clone --depth 1 -b test-suite-libxml2 \
+    https://github.com/nwellnhof/perl-XML-LibXML.git
+cd perl-XML-LibXML
+
+perl Makefile.PL INC="-I$incdir" LIBS="-L$libdir -lxml2"
+make
+make test

.gitlab-ci/downstream-php.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -e
+
+srcdir=$(pwd)
+
+mkdir -p install
+installdir="$srcdir/install"
+export PKG_CONFIG_PATH="$installdir/lib/pkgconfig"
+
+sh autogen.sh "--prefix=$installdir" --without-python
+make -j$(nproc)
+make install
+
+git clone --depth 1 https://gitlab.gnome.org/GNOME/libxslt.git
+cd libxslt
+sh autogen.sh \
+    "--prefix=$installdir" \
+    "--with-libxml-prefix=$installdir" \
+    --without-python
+make -j$(nproc)
+make install
+cd ..
+
+git clone --depth 1 https://github.com/php/php-src.git
+cd php-src
+./buildconf
+./configure --with-xsl --enable-soap --enable-debug
+make -j$(nproc)
+make TESTS=" \
+    -g FAIL \
+    --no-progress \
+    ext/dom \
+    ext/libxml \
+    ext/simplexml \
+    ext/soap \
+    ext/xml \
+    ext/xmlreader \
+    ext/xmlwriter \
+    ext/xsl \
+" test

.gitlab-ci/setup_mingw.sh

@@ -10,8 +10,9 @@ for module in libiconv python xz zlib "$@"; do
     pacman --noconfirm -S --needed ${prefix}$module
 done
 
-if [ ! -e libxml2-build/xmlconf ]; then
-    mkdir -p libxml2-build
+mkdir -p libxml2-build
+
+if [ ! -e xmlconf ]; then
     wget https://www.w3.org/XML/Test/xmlts20080827.tar -O - |
-       tar -x -C libxml2-build
+       tar -x
 fi

.gitlab-ci/test_meson.sh

@@ -11,7 +11,9 @@ meson  setup \
        --werror \
        --buildtype=debugoptimized \
        --default-library shared \
+       -Dlegacy=enabled \
        builddir
 
-ninja -C builddir test
+ninja -C builddir
 
+meson test --verbose -C builddir