[Qemu-devel] [PULL 0/2] Travis updates

[Qemu-devel] [PULL 0/2] Travis updates

[Alex Bennée]

The following changes since commit 7d2c6c95511e42dffe2b263275e09957723d0ff4:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20170206-1' into staging (2017-02-06 11:44:08 +0000)

are available in the git repository at:

  https://github.com/stsquad/qemu.git tags/pull-travis-10022017-1

for you to fetch changes up to 78a22af040b8ea7c26d52755facdc332ac7bac46:

  .travis.yml: split VM based builds (2017-02-10 13:19:56 +0000)

----------------------------------------------------------------
One minor fix and a build split to reduce timeouts.

----------------------------------------------------------------
Alex Bennée (2):
      .travis.yml: don't specify CONFIG twice
      .travis.yml: split VM based builds

 .travis.yml | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

-- 
2.11.0

[Qemu-devel] [PULL 1/2] .travis.yml: don't specify CONFIG twice

[Alex Bennée]

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d83e2d493b..3dc1e6439d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -104,8 +104,7 @@ matrix:
         - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
         - git submodule update --init --recursive
     # Trusty build with latest stable clang
-    - env: CONFIG=""
-      sudo: required
+    - sudo: required
       addons:
       dist: trusty
       language: generic
-- 
2.11.0

[Qemu-devel] [PULL 2/2] .travis.yml: split VM based builds

[Alex Bennée]

The Trusty based builds run a little slower than the main container
based ones. This is also true for the latest version of Clang. The
builds are getting very close (and occasionally run over) the 50 minute
timeout. Rather than partitioning by target I just split them into
linux-user and system builds.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .travis.yml | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3dc1e6439d..9008a796f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,8 +92,19 @@ matrix:
     - env: CONFIG=""
       os: osx
       compiler: clang
-    # Plain Trusty Build
-    - env: CONFIG=""
+    # Plain Trusty System Build
+    - env: CONFIG="--disable-linux-user"
+      sudo: required
+      addons:
+      dist: trusty
+      compiler: gcc
+      before_install:
+        - sudo apt-get update -qq
+        - sudo apt-get build-dep -qq qemu
+        - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
+        - git submodule update --init --recursive
+    # Plain Trusty Linux User Build
+    - env: CONFIG="--disable-system"
       sudo: required
       addons:
       dist: trusty
@@ -103,7 +114,26 @@ matrix:
         - sudo apt-get build-dep -qq qemu
         - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
         - git submodule update --init --recursive
-    # Trusty build with latest stable clang
+    # Trusty System build with latest stable clang
+    - sudo: required
+      addons:
+      dist: trusty
+      language: generic
+      compiler: none
+      env:
+        - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9
+        - CONFIG="--disable-linux-user --cc=clang-3.9 --cxx=clang++-3.9"
+      before_install:
+        - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+        - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main'
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq -y clang-3.9
+        - sudo apt-get build-dep -qq qemu
+        - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
+        - git submodule update --init --recursive
+      before_script:
+        - ./configure ${CONFIG} || cat config.log
+    # Trusty Linux User build with latest stable clang
     - sudo: required
       addons:
       dist: trusty
@@ -111,7 +141,7 @@ matrix:
       compiler: none
       env:
         - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9
-        - CONFIG="--cc=clang-3.9 --cxx=clang++-3.9"
+        - CONFIG="--disable-system --cc=clang-3.9 --cxx=clang++-3.9"
       before_install:
         - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
         - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main'
-- 
2.11.0

Re: [Qemu-devel] [PULL 0/2] Travis updates

[Peter Maydell]

On 10 February 2017 at 15:04, Alex Bennée <alex.bennee@linaro.org> wrote:
> The following changes since commit 7d2c6c95511e42dffe2b263275e09957723d0ff4:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20170206-1' into staging (2017-02-06 11:44:08 +0000)
>
> are available in the git repository at:
>
>   https://github.com/stsquad/qemu.git tags/pull-travis-10022017-1
>
> for you to fetch changes up to 78a22af040b8ea7c26d52755facdc332ac7bac46:
>
>   .travis.yml: split VM based builds (2017-02-10 13:19:56 +0000)
>
> ----------------------------------------------------------------
> One minor fix and a build split to reduce timeouts.
>
> ----------------------------------------------------------------
> Alex Bennée (2):
>       .travis.yml: don't specify CONFIG twice
>       .travis.yml: split VM based builds
>
>  .travis.yml | 39 ++++++++++++++++++++++++++++++++++-----
>  1 file changed, 34 insertions(+), 5 deletions(-)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/2] Travis updates

[Alex Bennée]

The following changes since commit b44486dfb9447c88e4b216e730adcc780190852c:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170110-1' into staging (2017-01-10 14:52:34 +0000)

are available in the git repository at:

  https://github.com/stsquad/qemu.git tags/pull-travis-20170112-1

for you to fetch changes up to ae1a772c5607f25cbdc80063f0f5a85290434058:

  travis: add Trusty with clang stable build (2017-01-12 10:04:17 +0000)

----------------------------------------------------------------
A couple of fixes to reduce the matrix some more that just missed the
last iteration.

----------------------------------------------------------------
Alex Bennée (1):
      travis: add Trusty with clang stable build

Daniel P. Berrange (1):
      travis: trim out most clang builds

 .travis.yml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

-- 
2.11.0

Re: [Qemu-devel] [PULL 0/2] Travis updates

[Peter Maydell]

On 12 January 2017 at 13:16, Alex Bennée <alex.bennee@linaro.org> wrote:
> The following changes since commit b44486dfb9447c88e4b216e730adcc780190852c:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170110-1' into staging (2017-01-10 14:52:34 +0000)
>
> are available in the git repository at:
>
>   https://github.com/stsquad/qemu.git tags/pull-travis-20170112-1
>
> for you to fetch changes up to ae1a772c5607f25cbdc80063f0f5a85290434058:
>
>   travis: add Trusty with clang stable build (2017-01-12 10:04:17 +0000)
>
> ----------------------------------------------------------------
> A couple of fixes to reduce the matrix some more that just missed the
> last iteration.
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM