From: Joe Orton <jorton@apache.org>
Date: Wed, 6 Nov 2019 11:45:21 +0000 (+0000)
Subject: Move before/run scripts out of .travis.yml.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1821
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5e989b77858357a8891f008552eb25db10d580d;p=thirdparty%2Fapache%2Fhttpd.git

Move before/run scripts out of .travis.yml.

Reviewed by: elukey


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869459 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index 63302ca3c43..9604140a1c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
new file mode 100755
index 00000000000..898af224475
--- /dev/null
+++ b/test/travis_before_linux.sh
@@ -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
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
new file mode 100755
index 00000000000..55087403b3f
--- /dev/null
+++ b/test/travis_run_linux.sh
@@ -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