[Qemu-devel] [PATCH v2 0/4] A number of Travis CI tweaks

[Qemu-devel] [PATCH v2 0/4] A number of Travis CI tweaks

[Alex Bennée]

Hi,

The patches I posted last week have been reviewed and I've given them
a good test on my tree. My last test failed but only because master
has introduced a regression. This was found by the tests in master but
missed due to the noise of GTester hangs which are mitigated by
reducing the times we run "make check" in this patch series.

Please apply to the trivial tree so we can get the master branch
testing a little less noisy soon ;-)

Alex Bennée (4):
  .travis.yml: add more linux-user to the build matrix
  .travis.yml: make the make slightly more parallel
  .travis.yml: pre-seed sub-modules for speed
  .travis.yml: remove "make check" from main matrix

 .travis.yml | 55 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 18 deletions(-)

-- 
2.1.0

[Qemu-devel] [PATCH v2 1/4] .travis.yml: add more linux-user to the build matrix

[Alex Bennée]

At the same time I've grouped the $ARCH-linux-user and $ARCH-softmmu
builds together (hoping FS cache helps) and grouped all $ARCH-softmmu
only builds into one target. This reduces the build matrix slightly
which will hopefully help with build times.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alexander Graf <agraf@suse.de>

diff --git a/.travis.yml b/.travis.yml
index 89c30ae..72cfc9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,23 +20,23 @@ env:
     - GUI_PKGS="libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev"
     - EXTRA_PKGS=""
   matrix:
+    # Group major targets together with their linux-user counterparts
     - TARGETS=alpha-softmmu,alpha-linux-user
-    - TARGETS=arm-softmmu,arm-linux-user
-    - TARGETS=aarch64-softmmu,aarch64-linux-user
-    - TARGETS=cris-softmmu
-    - TARGETS=i386-softmmu,x86_64-softmmu
-    - TARGETS=lm32-softmmu
-    - TARGETS=m68k-softmmu
-    - TARGETS=microblaze-softmmu,microblazeel-softmmu
+    - TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64-linux-user
+    - TARGETS=cris-softmmu,cris-linux-user
+    - TARGETS=i386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user
+    - TARGETS=m68k-softmmu,m68k-linux-user
+    - TARGETS=microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user
     - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu
-    - TARGETS=moxie-softmmu
-    - TARGETS=or32-softmmu,
-    - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu
-    - TARGETS=s390x-softmmu
-    - TARGETS=sh4-softmmu,sh4eb-softmmu
-    - TARGETS=sparc-softmmu,sparc64-softmmu
-    - TARGETS=unicore32-softmmu
-    - TARGETS=xtensa-softmmu,xtensaeb-softmmu
+    - TARGETS=mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user
+    - TARGETS=or32-softmmu,or32-linux-user
+    - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user
+    - TARGETS=s390x-softmmu,s390x-linux-user
+    - TARGETS=sh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user
+    - TARGETS=sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user
+    - TARGETS=unicore32-softmmu,unicore32-linux-user
+    # Group remaining softmmu only targets into one build
+    - TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu
 before_install:
   - git submodule update --init --recursive
   - sudo apt-get update -qq
-- 
2.1.0

Re: [Qemu-devel] [PATCH v2 1/4] .travis.yml: add more linux-user to the build matrix

[Brian Jackson]

On Wednesday, September 24, 2014 11:13:53 AM Alex Bennée wrote:
> At the same time I've grouped the $ARCH-linux-user and $ARCH-softmmu
> builds together (hoping FS cache helps) and grouped all $ARCH-softmmu
> only builds into one target. This reduces the build matrix slightly
> which will hopefully help with build times.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Alexander Graf <agraf@suse.de>

Reviewed-by: Brian Jackson <iggy@theiggy.com>

> 
> diff --git a/.travis.yml b/.travis.yml
> index 89c30ae..72cfc9f 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -20,23 +20,23 @@ env:
>      - GUI_PKGS="libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev
> libpixman-1-dev" - EXTRA_PKGS=""
>    matrix:
> +    # Group major targets together with their linux-user counterparts
>      - TARGETS=alpha-softmmu,alpha-linux-user
> -    - TARGETS=arm-softmmu,arm-linux-user
> -    - TARGETS=aarch64-softmmu,aarch64-linux-user
> -    - TARGETS=cris-softmmu
> -    - TARGETS=i386-softmmu,x86_64-softmmu
> -    - TARGETS=lm32-softmmu
> -    - TARGETS=m68k-softmmu
> -    - TARGETS=microblaze-softmmu,microblazeel-softmmu
> +    -
> TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64
> -linux-user +    - TARGETS=cris-softmmu,cris-linux-user
> +    - TARGETS=i386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user
> +    - TARGETS=m68k-softmmu,m68k-linux-user
> +    -
> TARGETS=microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,micro
> blazeel-linux-user -
> TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu -    -
> TARGETS=moxie-softmmu
> -    - TARGETS=or32-softmmu,
> -    - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu
> -    - TARGETS=s390x-softmmu
> -    - TARGETS=sh4-softmmu,sh4eb-softmmu
> -    - TARGETS=sparc-softmmu,sparc64-softmmu
> -    - TARGETS=unicore32-softmmu
> -    - TARGETS=xtensa-softmmu,xtensaeb-softmmu
> +    -
> TARGETS=mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-
> user,mipsn32-linux-user,mipsn32el-linux-user +    -
> TARGETS=or32-softmmu,or32-linux-user
> +    -
> TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux
> -user,ppc64abi32-linux-user,ppc64le-linux-user +    -
> TARGETS=s390x-softmmu,s390x-linux-user
> +    - TARGETS=sh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user
> +    -
> TARGETS=sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-us
> er,sparc64-linux-user +    - TARGETS=unicore32-softmmu,unicore32-linux-user
> +    # Group remaining softmmu only targets into one build
> +    -
> TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-
> softmmu before_install:
>    - git submodule update --init --recursive
>    - sudo apt-get update -qq

[Qemu-devel] [PATCH v2 2/4] .travis.yml: make the make slightly more parallel

[Alex Bennée]

The Travis VMs have 1.5 cores so we might as well make some use of the
paralellism.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alexander Graf <agraf@suse.de>

diff --git a/.travis.yml b/.travis.yml
index 72cfc9f..f113339 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,10 @@ before_install:
   - git submodule update --init --recursive
   - sudo apt-get update -qq
   - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS} ${EXTRA_PKGS}
-script: "./configure --target-list=${TARGETS} ${EXTRA_CONFIG} && make && ${TEST_CMD}"
+before_script:
+  - ./configure --target-list=${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG}
+script:
+  - make -j2 && {TEST_CMD}
 matrix:
   # We manually include a number of additional build for non-standard bits
   include:
-- 
2.1.0

Re: [Qemu-devel] [PATCH v2 2/4] .travis.yml: make the make slightly more parallel

[Brian Jackson]

On Wednesday, September 24, 2014 11:13:54 AM Alex Bennée wrote:
> The Travis VMs have 1.5 cores so we might as well make some use of the
> paralellism.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Alexander Graf <agraf@suse.de>

Reviewed-by: Brian Jackson <iggy@theiggy.com>

> 
> diff --git a/.travis.yml b/.travis.yml
> index 72cfc9f..f113339 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -41,7 +41,10 @@ before_install:
>    - git submodule update --init --recursive
>    - sudo apt-get update -qq
>    - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS}
> ${EXTRA_PKGS} -script: "./configure --target-list=${TARGETS}
> ${EXTRA_CONFIG} && make && ${TEST_CMD}" +before_script:
> +  - ./configure --target-list=${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG}
> +script:
> +  - make -j2 && {TEST_CMD}
>  matrix:
>    # We manually include a number of additional build for non-standard bits
>    include:

[Qemu-devel] [PATCH v2 3/4] .travis.yml: pre-seed sub-modules for speed

[Alex Bennée]

A significant portion of the build time is spent initialising all the
sub-modules we use in the source tree. Often this is almost as long as
the build itself. By pre-seeding the .git/modules tree this will
hopefully improve things.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alexander Graf <agraf@suse.de>

---
v2
  - use wget -O - | tar as suggested by agraf

diff --git a/.travis.yml b/.travis.yml
index f113339..b9025be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,11 @@ env:
     - TARGETS=unicore32-softmmu,unicore32-linux-user
     # Group remaining softmmu only targets into one build
     - TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu
+git:
+  # we want to do this ourselves
+  submodules: false
 before_install:
+  - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ
   - git submodule update --init --recursive
   - sudo apt-get update -qq
   - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS} ${EXTRA_PKGS}
-- 
2.1.0

Re: [Qemu-devel] [PATCH v2 3/4] .travis.yml: pre-seed sub-modules for speed

[Brian Jackson]

On Wednesday, September 24, 2014 11:13:55 AM Alex Bennée wrote:
> A significant portion of the build time is spent initialising all the
> sub-modules we use in the source tree. Often this is almost as long as
> the build itself. By pre-seeding the .git/modules tree this will
> hopefully improve things.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Alexander Graf <agraf@suse.de>

Reviewed-by: Brian Jackson <iggy@theiggy.com>

> 
> ---
> v2
>   - use wget -O - | tar as suggested by agraf
> 
> diff --git a/.travis.yml b/.travis.yml
> index f113339..b9025be 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -37,7 +37,11 @@ env:
>      - TARGETS=unicore32-softmmu,unicore32-linux-user
>      # Group remaining softmmu only targets into one build
>      -
> TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-
> softmmu +git:
> +  # we want to do this ourselves
> +  submodules: false
>  before_install:
> +  - wget -O -
> http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar
> -xvJ - git submodule update --init --recursive
>    - sudo apt-get update -qq
>    - sudo apt-get install -qq ${CORE_PKGS} ${NET_PKGS} ${GUI_PKGS}
> ${EXTRA_PKGS}

[Qemu-devel] [PATCH v2 4/4] .travis.yml: remove "make check" from main matrix

[Alex Bennée]

There are problems with unreliability in "make check" which still need
to be tracked down. As the tests are broadly the same for all targets if
added one explicit target to the matrix to run it. However this does
build all softmmu targets to ensure they at least "run"

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alexander Graf <agraf@suse.de>

diff --git a/.travis.yml b/.travis.yml
index b9025be..ad66e5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ notifications:
     on_failure: always
 env:
   global:
-    - TEST_CMD="make check"
+    - TEST_CMD=""
     - EXTRA_CONFIG=""
     # Development packages, EXTRA_PKGS saved for additional builds
     - CORE_PKGS="libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev"
@@ -48,10 +48,23 @@ before_install:
 before_script:
   - ./configure --target-list=${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG}
 script:
-  - make -j2 && {TEST_CMD}
+  - make -j2 && ${TEST_CMD}
 matrix:
   # We manually include a number of additional build for non-standard bits
   include:
+    # Make check target (we only do this once)
+    - env:
+        - TARGETS=alpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu,
+                  i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu,
+                  microblazeel-softmmu,mips-softmmu,mips64-softmmu,
+                  mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu,
+                  ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu,
+                  sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,
+                  unicore32-softmmu,unicore32-linux-user,
+                  lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,
+                  xtensaeb-softmmu
+          TEST_CMD="make check"
+      compiler: gcc
     # Debug related options
     - env: TARGETS=i386-softmmu,x86_64-softmmu
            EXTRA_CONFIG="--enable-debug"
@@ -80,7 +93,6 @@ matrix:
       compiler: gcc
     - env: TARGETS=i386-softmmu,x86_64-softmmu
            EXTRA_CONFIG="--enable-trace-backends=ftrace"
-           TEST_CMD=""
       compiler: gcc
     - env: TARGETS=i386-softmmu,x86_64-softmmu
           EXTRA_PKGS="liblttng-ust-dev liburcu-dev"
-- 
2.1.0

Re: [Qemu-devel] [PATCH v2 4/4] .travis.yml: remove "make check" from main matrix

[Brian Jackson]

On Wednesday, September 24, 2014 11:13:56 AM Alex Bennée wrote:
> There are problems with unreliability in "make check" which still need
> to be tracked down. As the tests are broadly the same for all targets if
> added one explicit target to the matrix to run it. However this does
> build all softmmu targets to ensure they at least "run"
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Alexander Graf <agraf@suse.de>

Reviewed-by: Brian Jackson <iggy@theiggy.com>

> 
> diff --git a/.travis.yml b/.travis.yml
> index b9025be..ad66e5b 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -12,7 +12,7 @@ notifications:
>      on_failure: always
>  env:
>    global:
> -    - TEST_CMD="make check"
> +    - TEST_CMD=""
>      - EXTRA_CONFIG=""
>      # Development packages, EXTRA_PKGS saved for additional builds
>      - CORE_PKGS="libusb-1.0-0-dev libiscsi-dev librados-dev
> libncurses5-dev" @@ -48,10 +48,23 @@ before_install:
>  before_script:
>    - ./configure --target-list=${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG}
> script:
> -  - make -j2 && {TEST_CMD}
> +  - make -j2 && ${TEST_CMD}
>  matrix:
>    # We manually include a number of additional build for non-standard bits
>    include:
> +    # Make check target (we only do this once)
> +    - env:
> +        - TARGETS=alpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu,
> +                 
> i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu, +             
>     microblazeel-softmmu,mips-softmmu,mips64-softmmu, +                 
> mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu, +                
>  ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu, +                 
> sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,
> +                  unicore32-softmmu,unicore32-linux-user,
> +                 
> lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu, +               
>   xtensaeb-softmmu
> +          TEST_CMD="make check"
> +      compiler: gcc
>      # Debug related options
>      - env: TARGETS=i386-softmmu,x86_64-softmmu
>             EXTRA_CONFIG="--enable-debug"
> @@ -80,7 +93,6 @@ matrix:
>        compiler: gcc
>      - env: TARGETS=i386-softmmu,x86_64-softmmu
>             EXTRA_CONFIG="--enable-trace-backends=ftrace"
> -           TEST_CMD=""
>        compiler: gcc
>      - env: TARGETS=i386-softmmu,x86_64-softmmu
>            EXTRA_PKGS="liblttng-ust-dev liburcu-dev"

Re: [Qemu-devel] [Qemu-trivial] [PATCH v2 0/4] A number of Travis CI tweaks

[Michael Tokarev]

24.09.2014 14:13, Alex Bennée wrote:
> Hi,
> 
> The patches I posted last week have been reviewed and I've given them
> a good test on my tree. My last test failed but only because master
> has introduced a regression. This was found by the tests in master but
> missed due to the noise of GTester hangs which are mitigated by
> reducing the times we run "make check" in this patch series.
> 
> Please apply to the trivial tree so we can get the master branch
> testing a little less noisy soon ;-)

Applied to -trivial.  Without any testing at all, as promised... :)

Thanks,

/mjt