Thanks, RĂ¼diger. I was about to go looking for that...

> Am 23.09.2021 um 13:12 schrieb rpl...@apache.org:
> 
> Author: rpluem
> Date: Thu Sep 23 11:12:25 2021
> New Revision: 1893549
> 
> URL: http://svn.apache.org/viewvc?rev=1893549&view=rev
> Log:
> * t/modules/http2.t is gone since 1893547. So do not use it any longer in
>  HTTP/2 tests and remove the dependency on Protocol::HTTP2::Client. 
>  Update test/travis_run_linux.sh to handle NO_TEST_FRAMEWORK.
> 
> Modified:
>    httpd/httpd/trunk/.travis.yml
>    httpd/httpd/trunk/test/travis_run_linux.sh
> 
> Modified: httpd/httpd/trunk/.travis.yml
> URL: 
> http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1893549&r1=1893548&r2=1893549&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/.travis.yml (original)
> +++ httpd/httpd/trunk/.travis.yml Thu Sep 23 11:12:25 2021
> @@ -271,7 +271,7 @@ jobs:
>       env: APR_VERSION=1.7.0
>            APU_VERSION=1.6.1 APU_CONFIG="--with-crypto"
>            CONFIG="--enable-mods-shared=reallyall --with-mpm=event 
> --enable-mpms-shared=event"
> -           TESTS="t/modules/http2.t" TEST_INSTALL=1 TEST_H2=1
> +           NO_TEST_FRAMEWORK=1 TEST_INSTALL=1 TEST_H2=1
>       addons:
>         apt:
>           sources:
> @@ -382,7 +382,7 @@ before_install:
>   - if [ "$TRAVIS_OS_NAME" = "linux" -a ! -v SKIP_TESTING ]; then
>         if [ -v CLEAR_CACHE ]; then rm -rf ~/perl5; fi;
>         cpanm --local-lib=~/perl5 local::lib && eval $(perl -I 
> ~/perl5/lib/perl5/ -Mlocal::lib);
> -        CC=gcc cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed 
> Test::More AnyEvent DateTime HTTP::DAV Protocol::HTTP2::Client FCGI 
> AnyEvent::WebSocket::Client Apache::Test;
> +        CC=gcc cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed 
> Test::More AnyEvent DateTime HTTP::DAV FCGI AnyEvent::WebSocket::Client 
> Apache::Test;
>     fi
> 
> before_script:
> 
> Modified: httpd/httpd/trunk/test/travis_run_linux.sh
> URL: 
> http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1893549&r1=1893548&r2=1893549&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/test/travis_run_linux.sh (original)
> +++ httpd/httpd/trunk/test/travis_run_linux.sh Thu Sep 23 11:12:25 2021
> @@ -94,22 +94,24 @@ if ! test -v SKIP_TESTING; then
>     # Try to keep all potential coredumps from all processes
>     sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true
> 
> -    if test -v WITH_TEST_SUITE; then
> -        make check TESTS="${TESTS}" TEST_CONFIG="${TEST_ARGS}"
> -        RV=$?
> -    else
> -        test -v TEST_INSTALL || make install
> -        pushd test/perl-framework
> -            perl Makefile.PL -apxs $PREFIX/bin/apxs
> -            make test APACHE_TEST_EXTRA_ARGS="${TEST_ARGS} ${TESTS}"
> +    if ! test -v NO_TEST_FRAMEWORK; then
> +        if test -v WITH_TEST_SUITE; then
> +            make check TESTS="${TESTS}" TEST_CONFIG="${TEST_ARGS}"
>             RV=$?
> -        popd
> -    fi
> +        else
> +            test -v TEST_INSTALL || make install
> +            pushd test/perl-framework
> +                perl Makefile.PL -apxs $PREFIX/bin/apxs
> +                make test APACHE_TEST_EXTRA_ARGS="${TEST_ARGS} ${TESTS}"
> +                RV=$?
> +            popd
> +        fi
> 
> -    # Skip further testing if a core dump was created during the test
> -    # suite run above.
> -    if test $RV -eq 0 && test -n "`ls test/perl-framework/t/core{,.*} 
> 2>/dev/null`"; then
> -        RV=4
> +        # Skip further testing if a core dump was created during the test
> +        # suite run above.
> +        if test $RV -eq 0 && test -n "`ls test/perl-framework/t/core{,.*} 
> 2>/dev/null`"; then
> +            RV=4
> +        fi
>     fi
> 
>     if test -v TEST_SSL -a $RV -eq 0; then
> 
> 

Reply via email to