diff options
| author | Joe Orton <jorton@apache.org> | 2024-02-29 14:19:26 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2024-02-29 14:19:26 +0100 |
| commit | 39e25a4a189da2d2ddbd5c03169cad88c3b3c0dc (patch) | |
| tree | 157ed0c3894cf7b6c79a7134afa58cf90d8c600a /test/travis_run_linux.sh | |
| parent | CI: Hopefully fix caching and artifact uploads by creating $JOBID (diff) | |
| download | apache2-39e25a4a189da2d2ddbd5c03169cad88c3b3c0dc.tar.xz apache2-39e25a4a189da2d2ddbd5c03169cad88c3b3c0dc.zip | |
CI: Enable caching for the rustls install used for mod_tls testing.
Github: closes #416
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916052 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rwxr-xr-x | test/travis_run_linux.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index fc082abde5..c1a6fae591 100755 --- a/test/travis_run_linux.sh +++ b/test/travis_run_linux.sh @@ -54,16 +54,9 @@ else CONFIG="$CONFIG --with-apr-util=/usr" fi -# Since librustls is not a package (yet) on any platform, we -# build the version we want from source -if test -v TEST_MOD_TLS; then - RUSTLS_HOME="$HOME/build/rustls-ffi" - RUSTLS_VERSION="v0.10.0" - git clone -b "$RUSTLS_VERSION" https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME" - pushd "$RUSTLS_HOME" - make install DESTDIR="$PREFIX" - popd - CONFIG="$CONFIG --with-tls --with-rustls=$PREFIX" +# Pick up the rustls install built previously. +if test -v TEST_MOD_TLS -a RUSTLS_VERSION; then + CONFIG="$CONFIG --with-tls --with-rustls=$HOME/root/rustls" fi if test -v TEST_OPENSSL3; then |