mirror of
https://github.com/curl/curl.git
synced 2026-05-15 18:56:25 +03:00
tests: add HTTP/3 test case, custom location for proper nghttpx
- adding support for HTTP/3 test cases via a nghttpx server that is
build with ngtcp2 and nghttp3.
- test2500 is the first test case, performing a simple GET.
- nghttpx is checked for support and the 'feature' nghttpx-h3
is set accordingly. test2500 will only run, when supported.
- a specific nghttpx location can be given in the environment
variable NGHTTPX or via the configure option
--with-test-nghttpx=<path>
Extend NGHTTPX config to H2 tests as well
* use $ENV{NGHTTPX} and the configured default also in http2 server starts
* always provide the empty test/nghttpx.conf to nghttpx. as it defaults to
reading /etc/nghttpx/nghttpx.conf otherwise.
Added nghttpx to CI ngtcp2 jobs to run h3 tests.
Closes #9031
This commit is contained in:
Stefan Eissing
Daniel Stenberg
parent
0186ec41b1
commit
ca15b7512e
16 changed files with 582 additions and 24 deletions
41
.github/workflows/ngtcp2-gnutls.yml
vendored
41
.github/workflows/ngtcp2-gnutls.yml
vendored
|
|
@ -28,9 +28,21 @@ jobs:
|
|||
matrix:
|
||||
build:
|
||||
- name: gnutls
|
||||
install: nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools texinfo texlive texlive-extra-utils autopoint libev-dev
|
||||
configure: LDFLAGS="-Wl,-rpath,$HOME/all/lib" --with-gnutls=$HOME/all --enable-debug
|
||||
gnutls-configure: --with-included-libtasn1 --with-included-unistring --disable-guile --disable-doc --disable-tests
|
||||
install: >-
|
||||
libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
|
||||
nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin
|
||||
libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools
|
||||
texinfo texlive texlive-extra-utils autopoint libev-dev
|
||||
configure: >-
|
||||
PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
|
||||
--with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
|
||||
--with-test-nghttpx="$HOME/all/bin/nghttpx"
|
||||
ngtcp2-configure: >-
|
||||
--prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
|
||||
gnutls-configure: >-
|
||||
PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib -L$HOME/all/lib"
|
||||
--with-included-libtasn1 --with-included-unistring
|
||||
--disable-guile --disable-doc --disable-tests --disable-tools
|
||||
|
||||
steps:
|
||||
- run: |
|
||||
|
|
@ -39,6 +51,13 @@ jobs:
|
|||
sudo python3 -m pip install impacket
|
||||
name: 'install prereqs and impacket'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 -b openssl-3.0.7+quic https://github.com/quictls/openssl
|
||||
cd openssl
|
||||
./config --prefix=$HOME/all --libdir=$HOME/all/lib
|
||||
make install_sw
|
||||
name: 'install quictls'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 https://gitlab.com/gnutls/nettle.git
|
||||
cd nettle
|
||||
|
|
@ -51,7 +70,7 @@ jobs:
|
|||
git clone --depth=1 -b 3.7.7 https://github.com/gnutls/gnutls.git
|
||||
cd gnutls
|
||||
./bootstrap
|
||||
./configure PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib -L$HOME/all/lib" --prefix=$HOME/all ${{ matrix.build.gnutls-configure }} --disable-tools
|
||||
./configure ${{ matrix.build.gnutls-configure }} --prefix=$HOME/all
|
||||
make install
|
||||
name: 'install gnutls'
|
||||
|
||||
|
|
@ -59,7 +78,7 @@ jobs:
|
|||
git clone --depth=1 https://github.com/ngtcp2/nghttp3
|
||||
cd nghttp3
|
||||
autoreconf -fi
|
||||
./configure --prefix=$HOME/all --enable-lib-only
|
||||
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
|
||||
make install
|
||||
name: 'install nghttp3'
|
||||
|
||||
|
|
@ -67,16 +86,24 @@ jobs:
|
|||
git clone --depth=1 https://github.com/ngtcp2/ngtcp2
|
||||
cd ngtcp2
|
||||
autoreconf -fi
|
||||
./configure PKG_CONFIG_PATH=$HOME/all/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/all/lib" --prefix=$HOME/all --enable-lib-only --with-gnutls=$HOME/all
|
||||
./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl --with-gnutls
|
||||
make install
|
||||
name: 'install ngtcp2'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 https://github.com/nghttp2/nghttp2
|
||||
cd nghttp2
|
||||
autoreconf -fi
|
||||
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
|
||||
make install
|
||||
name: 'install nghttp2'
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- run: autoreconf -fi
|
||||
name: 'autoreconf'
|
||||
|
||||
- run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
|
||||
- run: ./configure --with-gnutls=$HOME/all ${{ matrix.build.configure }}
|
||||
name: 'configure'
|
||||
|
||||
- run: make V=1
|
||||
|
|
|
|||
98
.github/workflows/ngtcp2-quictls.yml
vendored
Normal file
98
.github/workflows/ngtcp2-quictls.yml
vendored
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
# Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
#
|
||||
# SPDX-License-Identifier: curl
|
||||
|
||||
name: ngtcp2
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- '*/ci'
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
|
||||
concurrency:
|
||||
# Hardcoded workflow filename as workflow name above is just Linux again
|
||||
group: ngtcp2-openssl-${{ github.event.pull_request.number || github.sha }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
autotools:
|
||||
name: ${{ matrix.build.name }}
|
||||
runs-on: 'ubuntu-latest'
|
||||
timeout-minutes: 60
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
build:
|
||||
- name: quictls
|
||||
install: >-
|
||||
libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
|
||||
configure: >-
|
||||
PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
|
||||
--with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
|
||||
--with-test-nghttpx="$HOME/all/bin/nghttpx"
|
||||
ngtcp2-configure: >-
|
||||
--prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
|
||||
|
||||
steps:
|
||||
- run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
|
||||
sudo python3 -m pip install impacket
|
||||
name: 'install prereqs and impacket'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 -b openssl-3.0.7+quic https://github.com/quictls/openssl
|
||||
cd openssl
|
||||
./config --prefix=$HOME/all --libdir=$HOME/all/lib
|
||||
make install_sw
|
||||
name: 'install quictls'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 https://github.com/ngtcp2/nghttp3
|
||||
cd nghttp3
|
||||
autoreconf -fi
|
||||
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
|
||||
make install
|
||||
name: 'install nghttp3'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 https://github.com/ngtcp2/ngtcp2
|
||||
cd ngtcp2
|
||||
autoreconf -fi
|
||||
./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl
|
||||
make install
|
||||
name: 'install ngtcp2'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 https://github.com/nghttp2/nghttp2
|
||||
cd nghttp2
|
||||
autoreconf -fi
|
||||
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
|
||||
make install
|
||||
name: 'install nghttp2'
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- run: autoreconf -fi
|
||||
name: 'autoreconf'
|
||||
|
||||
- run: ./configure --with-openssl=$HOME/all ${{ matrix.build.configure }}
|
||||
name: 'configure'
|
||||
|
||||
- run: make V=1
|
||||
name: 'make'
|
||||
|
||||
- run: make V=1 examples
|
||||
name: 'make examples'
|
||||
|
||||
- run: make V=1 -C tests
|
||||
name: 'make tests'
|
||||
|
||||
- run: make V=1 test-ci
|
||||
name: 'run tests'
|
||||
env:
|
||||
TFLAGS: "${{ matrix.build.tflags }}"
|
||||
39
.github/workflows/ngtcp2-wolfssl.yml
vendored
39
.github/workflows/ngtcp2-wolfssl.yml
vendored
|
|
@ -28,9 +28,17 @@ jobs:
|
|||
matrix:
|
||||
build:
|
||||
- name: wolfssl
|
||||
install:
|
||||
configure: LDFLAGS="-Wl,-rpath,$HOME/all/lib" --with-wolfssl=$HOME/all --enable-debug
|
||||
wolfssl-configure: --enable-quic --enable-session-ticket --enable-earlydata --enable-psk --enable-harden --enable-altcertchains
|
||||
install: >-
|
||||
libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
|
||||
configure: >-
|
||||
PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
|
||||
--with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
|
||||
--with-test-nghttpx="$HOME/all/bin/nghttpx"
|
||||
ngtcp2-configure: >-
|
||||
--prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
|
||||
wolfssl-configure: >-
|
||||
--enable-quic --enable-session-ticket --enable-earlydata --enable-psk
|
||||
--enable-harden --enable-altcertchains
|
||||
|
||||
steps:
|
||||
- run: |
|
||||
|
|
@ -48,27 +56,42 @@ jobs:
|
|||
name: 'install wolfssl'
|
||||
|
||||
- run: |
|
||||
git clone https://github.com/ngtcp2/nghttp3
|
||||
git clone --depth=1 -b openssl-3.0.7+quic https://github.com/quictls/openssl
|
||||
cd openssl
|
||||
./config --prefix=$HOME/all --libdir=$HOME/all/lib
|
||||
make install_sw
|
||||
name: 'install quictls'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 https://github.com/ngtcp2/nghttp3
|
||||
cd nghttp3
|
||||
autoreconf -fi
|
||||
./configure --prefix=$HOME/all --enable-lib-only
|
||||
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
|
||||
make install
|
||||
name: 'install nghttp3'
|
||||
|
||||
- run: |
|
||||
git clone https://github.com/ngtcp2/ngtcp2
|
||||
git clone --depth=1 https://github.com/ngtcp2/ngtcp2
|
||||
cd ngtcp2
|
||||
autoreconf -fi
|
||||
./configure PKG_CONFIG_PATH=$HOME/all/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/all/lib" --prefix=$HOME/all --enable-lib-only --with-wolfssl=$HOME/all
|
||||
./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl --with-wolfssl
|
||||
make install
|
||||
name: 'install ngtcp2'
|
||||
|
||||
- run: |
|
||||
git clone --depth=1 https://github.com/nghttp2/nghttp2
|
||||
cd nghttp2
|
||||
autoreconf -fi
|
||||
./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
|
||||
make install
|
||||
name: 'install nghttp2'
|
||||
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- run: autoreconf -fi
|
||||
name: 'autoreconf'
|
||||
|
||||
- run: ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
|
||||
- run: ./configure --with-wolfssl=$HOME/all ${{ matrix.build.configure }}
|
||||
name: 'configure'
|
||||
|
||||
- run: make V=1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue