diff mbox series

[PULL,02/26] .travis.yml: combine docs and tools build with out-of-tree

Message ID 20190312170931.25013-3-alex.bennee@linaro.org
State Accepted
Commit 956d4506736da3c157c91f3f0d63d38be390c620
Headers show
Series final testing updates for 4.0 | expand

Commit Message

Alex Bennée March 12, 2019, 5:09 p.m. UTC 
We will be moving all builds out of tree eventually but for now we
need to for building the docs as sphinx requires an out-of-tree build.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.20.1
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index ecaea97650..c46b0c28df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -114,8 +114,9 @@  matrix:
         - TEST_CMD="make check-unit -j3 V=1"
 
 
-    # Check we can build docs and tools
+    # Check we can build docs and tools (out of tree)
     - env:
+        - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."
         - BASE_CONFIG="--enable-tools --enable-docs"
         - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user"
       addons:
@@ -125,11 +126,6 @@  matrix:
             - texinfo
             - perl
 
-    # Test out-of-tree builds
-    - env:
-        - CONFIG="--enable-debug --enable-debug-tcg"
-        - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.."
-
 
     # Test with Clang for compile portability (Travis uses clang-5.0)
     - env: