You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2019/11/06 11:45:21 UTC
svn commit: r1869459 - in /httpd/httpd/trunk: .travis.yml
test/travis_before_linux.sh test/travis_run_linux.sh
Author: jorton
Date: Wed Nov 6 11:45:21 2019
New Revision: 1869459
URL: http://svn.apache.org/viewvc?rev=1869459&view=rev
Log:
Move before/run scripts out of .travis.yml.
Reviewed by: elukey
Added:
httpd/httpd/trunk/test/travis_before_linux.sh (with props)
httpd/httpd/trunk/test/travis_run_linux.sh (with props)
Modified:
httpd/httpd/trunk/.travis.yml
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1869459&r1=1869458&r2=1869459&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Wed Nov 6 11:45:21 2019
@@ -70,16 +70,7 @@ before_install:
fi
before_script:
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
- svn export -q https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr;
- test -v SKIP_TESTING || svn export -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk test/perl-framework;
- fi
+ - ./test/travis_before_${TRAVIS_OS_NAME}.sh
script:
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
- ./buildconf;
- test -v SKIP_TESTING || CONFIG="--with-test-suite=test/perl-framework $CONFIG";
- ./configure $CONFIG --with-apr=/usr --with-apr-util=/usr;
- make $MAKEFLAGS -j2;
- test -v SKIP_TESTING || make check;
- fi
+ - ./test/travis_run_${TRAVIS_OS_NAME}.sh
Added: httpd/httpd/trunk/test/travis_before_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_before_linux.sh?rev=1869459&view=auto
==============================================================================
--- httpd/httpd/trunk/test/travis_before_linux.sh (added)
+++ httpd/httpd/trunk/test/travis_before_linux.sh Wed Nov 6 11:45:21 2019
@@ -0,0 +1,5 @@
+#!/bin/bash -ex
+svn export -q https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr
+if ! test -v SKIP_TESTING; then
+ svn export -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk test/perl-framework
+fi
Propchange: httpd/httpd/trunk/test/travis_before_linux.sh
------------------------------------------------------------------------------
svn:executable = *
Added: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1869459&view=auto
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (added)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Wed Nov 6 11:45:21 2019
@@ -0,0 +1,6 @@
+#!/bin/bash -ex
+./buildconf
+test -v SKIP_TESTING || CONFIG="--with-test-suite=test/perl-framework $CONFIG"
+./configure $CONFIG --with-apr=/usr --with-apr-util=/usr
+make $MAKEFLAGS -j2
+test -v SKIP_TESTING || make check
Propchange: httpd/httpd/trunk/test/travis_run_linux.sh
------------------------------------------------------------------------------
svn:executable = *
Re: svn commit: r1869459 - in /httpd/httpd/trunk: .travis.yml
test/travis_before_linux.sh test/travis_run_linux.sh
Posted by Joe Orton <jo...@redhat.com>.
On Fri, Nov 08, 2019 at 11:04:32AM +0100, Ruediger Pluem wrote:
> On 11/06/2019 12:45 PM, jorton@apache.org wrote:
> > ==============================================================================
> > --- httpd/httpd/trunk/test/travis_before_linux.sh (added)
> > +++ httpd/httpd/trunk/test/travis_before_linux.sh Wed Nov 6 11:45:21 2019
> > @@ -0,0 +1,5 @@
> > +#!/bin/bash -ex
> > +svn export -q https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr
>
> Hmm. Why checking out apr trunk, when we supply --with-apr=/usr --with-apr-util=/usr to configure?
> Just for buildconf to work?
Yup, I had it there for buildconf. It was removed in r1869533 and
actually we can switch to running buildconf against the APR version
where available, thanks for the prompt.
Regards, Joe
Re: svn commit: r1869459 - in /httpd/httpd/trunk: .travis.yml
test/travis_before_linux.sh test/travis_run_linux.sh
Posted by Ruediger Pluem <rp...@apache.org>.
On 11/06/2019 12:45 PM, jorton@apache.org wrote:
> Author: jorton
> Date: Wed Nov 6 11:45:21 2019
> New Revision: 1869459
>
> URL: http://svn.apache.org/viewvc?rev=1869459&view=rev
> Log:
> Move before/run scripts out of .travis.yml.
>
> Reviewed by: elukey
>
> Added:
> httpd/httpd/trunk/test/travis_before_linux.sh (with props)
> httpd/httpd/trunk/test/travis_run_linux.sh (with props)
> Modified:
> httpd/httpd/trunk/.travis.yml
>
> Added: httpd/httpd/trunk/test/travis_before_linux.sh
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_before_linux.sh?rev=1869459&view=auto
> ==============================================================================
> --- httpd/httpd/trunk/test/travis_before_linux.sh (added)
> +++ httpd/httpd/trunk/test/travis_before_linux.sh Wed Nov 6 11:45:21 2019
> @@ -0,0 +1,5 @@
> +#!/bin/bash -ex
> +svn export -q https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr
Hmm. Why checking out apr trunk, when we supply --with-apr=/usr --with-apr-util=/usr to configure?
Just for buildconf to work?
Regards
Rüdiger