* [PATCH v2 1/3] travis: skip building coverity, smoke, and master
@ 2016-03-04 20:09 Doug Goldstein
2016-03-04 20:09 ` [PATCH v2 2/3] travis: use matching C++ for GCC version Doug Goldstein
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Doug Goldstein @ 2016-03-04 20:09 UTC (permalink / raw)
To: xen-devel
Cc: Keir Fraser, Doug Goldstein, Ian Jackson, Tim Deegan, Jan Beulich,
Andrew Cooper
Skip building of the coverity, smoke, stable, and master branches since
they just fast forward from staging.
Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
CC: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Keir Fraser <keir@xen.org>
CC: Tim Deegan <tim@xen.org>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
change since v1:
- ignore all coverity tested branches
- ignore stable branches as well
---
.travis.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 6693af2..6803e2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,13 @@
language: c
dist: trusty
sudo: required
+# don't test master, smoke and coverity branches
+branches:
+ except:
+ - master
+ - smoke
+ - /^coverity-tested\/.*/
+ - /^stable-.*/
matrix:
include:
- compiler: gcc
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/3] travis: use matching C++ for GCC version
2016-03-04 20:09 [PATCH v2 1/3] travis: skip building coverity, smoke, and master Doug Goldstein
@ 2016-03-04 20:09 ` Doug Goldstein
2016-03-04 20:09 ` [PATCH v2 3/3] travis: actually disable debug for non-debug Doug Goldstein
2016-03-07 15:18 ` [PATCH v2 1/3] travis: skip building coverity, smoke, and master Konrad Rzeszutek Wilk
2 siblings, 0 replies; 5+ messages in thread
From: Doug Goldstein @ 2016-03-04 20:09 UTC (permalink / raw)
To: xen-devel
Cc: Keir Fraser, Doug Goldstein, Ian Jackson, Tim Deegan, Jan Beulich,
Andrew Cooper
When we use GCC 5.x, we need to install the C++ compiler and the C
compiler together because QEMU tests for feature flags against the C
compiler and assumes the C++ compiler has them. We also have to
ensure that it is used. Have to do the modification of the CXX variable
in two steps to ensure we support older versions of bash in use by the
test machines. While we're at it simply how we select our compiler.
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
CC: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Keir Fraser <keir@xen.org>
CC: Tim Deegan <tim@xen.org>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
change since v1:
- none
---
.travis.yml | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6803e2f..4bcd5a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,20 +14,20 @@ matrix:
env: XEN_TARGET_ARCH=x86_64
- compiler: gcc
env: XEN_TARGET_ARCH=x86_64 XEN_CONFIG_EXPERT=y RANDCONFIG=y
- - compiler: gcc
- env: XEN_TARGET_ARCH=x86_64 COMPILER=gcc-5
+ - compiler: gcc-5
+ env: XEN_TARGET_ARCH=x86_64
- compiler: gcc
env: XEN_TARGET_ARCH=x86_64 debug=y
- - compiler: gcc
- env: XEN_TARGET_ARCH=x86_64 COMPILER=gcc-5 debug=y
+ - compiler: gcc-5
+ env: XEN_TARGET_ARCH=x86_64 debug=y
- compiler: clang
env: XEN_TARGET_ARCH=x86_64 clang=y
- - compiler: clang
- env: XEN_TARGET_ARCH=x86_64 COMPILER=clang-3.8 clang=y
+ - compiler: clang-3.8
+ env: XEN_TARGET_ARCH=x86_64 clang=y
- compiler: clang
env: XEN_TARGET_ARCH=x86_64 clang=y debug=y
- - compiler: clang
- env: XEN_TARGET_ARCH=x86_64 COMPILER=clang-3.8 clang=y debug=y
+ - compiler: clang-3.8
+ env: XEN_TARGET_ARCH=x86_64 clang=y debug=y
- compiler: gcc
env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf-
- compiler: gcc
@@ -73,15 +73,18 @@ addons:
- gcc-arm-linux-gnueabihf
- gcc-aarch64-linux-gnu
- gcc-5
+ - g++-5
- clang-3.8
+# we must set CXX manually instead of using 'language: cpp' due to
+# travis-ci/travis-ci#3871
before_script:
- - export CC=${COMPILER:-${CC}}
- - ${CC} --version
+ - export CXX=${CC/cc/++}
+ - export CXX=${CXX/clang/clang++}
script:
- ( [ "x${RANDCONFIG}" = "xy" ] && ( make -C xen randconfig )
|| exit 0 )
- ( ./configure --disable-tools --disable-stubdom --enable-docs &&
- make CC="${CROSS_COMPILE}${CC}" HOSTCC="${CC}" dist )
+ make dist )
after_script:
- cat xen/.config
notifications:
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 3/3] travis: actually disable debug for non-debug
2016-03-04 20:09 [PATCH v2 1/3] travis: skip building coverity, smoke, and master Doug Goldstein
2016-03-04 20:09 ` [PATCH v2 2/3] travis: use matching C++ for GCC version Doug Goldstein
@ 2016-03-04 20:09 ` Doug Goldstein
2016-03-07 15:32 ` Konrad Rzeszutek Wilk
2016-03-07 15:18 ` [PATCH v2 1/3] travis: skip building coverity, smoke, and master Konrad Rzeszutek Wilk
2 siblings, 1 reply; 5+ messages in thread
From: Doug Goldstein @ 2016-03-04 20:09 UTC (permalink / raw)
To: xen-devel
Cc: Keir Fraser, Doug Goldstein, Ian Jackson, Tim Deegan, Jan Beulich,
Andrew Cooper
Non-debug builds need to explicitly disable debug due to debug being
defaulted to y in Config.mk
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
CC: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Keir Fraser <keir@xen.org>
CC: Tim Deegan <tim@xen.org>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
change since v1:
- none
tested at: https://travis-ci.org/cardoe/xen/builds/113700670
this run shows a failure with BIGMEM=y and debug=n which was only exposed
by this change.
---
.travis.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4bcd5a0..741a8ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,33 +11,33 @@ branches:
matrix:
include:
- compiler: gcc
- env: XEN_TARGET_ARCH=x86_64
+ env: XEN_TARGET_ARCH=x86_64 debug=n
- compiler: gcc
- env: XEN_TARGET_ARCH=x86_64 XEN_CONFIG_EXPERT=y RANDCONFIG=y
+ env: XEN_TARGET_ARCH=x86_64 XEN_CONFIG_EXPERT=y RANDCONFIG=y debug=n
- compiler: gcc-5
- env: XEN_TARGET_ARCH=x86_64
+ env: XEN_TARGET_ARCH=x86_64 debug=n
- compiler: gcc
env: XEN_TARGET_ARCH=x86_64 debug=y
- compiler: gcc-5
env: XEN_TARGET_ARCH=x86_64 debug=y
- compiler: clang
- env: XEN_TARGET_ARCH=x86_64 clang=y
+ env: XEN_TARGET_ARCH=x86_64 clang=y debug=n
- compiler: clang-3.8
- env: XEN_TARGET_ARCH=x86_64 clang=y
+ env: XEN_TARGET_ARCH=x86_64 clang=y debug=n
- compiler: clang
env: XEN_TARGET_ARCH=x86_64 clang=y debug=y
- compiler: clang-3.8
env: XEN_TARGET_ARCH=x86_64 clang=y debug=y
- compiler: gcc
- env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf-
+ env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- debug=n
- compiler: gcc
- env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- XEN_CONFIG_EXPERT=y RANDCONFIG=y
+ env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- XEN_CONFIG_EXPERT=y RANDCONFIG=y debug=n
- compiler: gcc
env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- debug=y
- compiler: gcc
- env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-
+ env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- debug=n
- compiler: gcc
- env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- XEN_CONFIG_EXPERT=y RANDCONFIG=y
+ env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- XEN_CONFIG_EXPERT=y RANDCONFIG=y debug=n
- compiler: gcc
env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- debug=y
addons:
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 3/3] travis: actually disable debug for non-debug
2016-03-04 20:09 ` [PATCH v2 3/3] travis: actually disable debug for non-debug Doug Goldstein
@ 2016-03-07 15:32 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 5+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-03-07 15:32 UTC (permalink / raw)
To: Doug Goldstein
Cc: Keir Fraser, Tim Deegan, Ian Jackson, xen-devel, Jan Beulich,
Andrew Cooper
On Fri, Mar 04, 2016 at 02:09:48PM -0600, Doug Goldstein wrote:
> Non-debug builds need to explicitly disable debug due to debug being
> defaulted to y in Config.mk
Which is because by default staging has debug=y (this changes once
the rcX candidates become available).
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
> ---
> CC: Ian Jackson <ian.jackson@eu.citrix.com>
> CC: Jan Beulich <jbeulich@suse.com>
> CC: Keir Fraser <keir@xen.org>
> CC: Tim Deegan <tim@xen.org>
> CC: Andrew Cooper <andrew.cooper3@citrix.com>
>
> change since v1:
> - none
>
> tested at: https://travis-ci.org/cardoe/xen/builds/113700670
> this run shows a failure with BIGMEM=y and debug=n which was only exposed
> by this change.
> ---
> .travis.yml | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index 4bcd5a0..741a8ab 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -11,33 +11,33 @@ branches:
> matrix:
> include:
> - compiler: gcc
> - env: XEN_TARGET_ARCH=x86_64
> + env: XEN_TARGET_ARCH=x86_64 debug=n
> - compiler: gcc
> - env: XEN_TARGET_ARCH=x86_64 XEN_CONFIG_EXPERT=y RANDCONFIG=y
> + env: XEN_TARGET_ARCH=x86_64 XEN_CONFIG_EXPERT=y RANDCONFIG=y debug=n
> - compiler: gcc-5
> - env: XEN_TARGET_ARCH=x86_64
> + env: XEN_TARGET_ARCH=x86_64 debug=n
> - compiler: gcc
> env: XEN_TARGET_ARCH=x86_64 debug=y
> - compiler: gcc-5
> env: XEN_TARGET_ARCH=x86_64 debug=y
> - compiler: clang
> - env: XEN_TARGET_ARCH=x86_64 clang=y
> + env: XEN_TARGET_ARCH=x86_64 clang=y debug=n
> - compiler: clang-3.8
> - env: XEN_TARGET_ARCH=x86_64 clang=y
> + env: XEN_TARGET_ARCH=x86_64 clang=y debug=n
> - compiler: clang
> env: XEN_TARGET_ARCH=x86_64 clang=y debug=y
> - compiler: clang-3.8
> env: XEN_TARGET_ARCH=x86_64 clang=y debug=y
> - compiler: gcc
> - env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf-
> + env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- debug=n
> - compiler: gcc
> - env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- XEN_CONFIG_EXPERT=y RANDCONFIG=y
> + env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- XEN_CONFIG_EXPERT=y RANDCONFIG=y debug=n
> - compiler: gcc
> env: XEN_TARGET_ARCH=arm32 CROSS_COMPILE=arm-linux-gnueabihf- debug=y
> - compiler: gcc
> - env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-
> + env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- debug=n
> - compiler: gcc
> - env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- XEN_CONFIG_EXPERT=y RANDCONFIG=y
> + env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- XEN_CONFIG_EXPERT=y RANDCONFIG=y debug=n
> - compiler: gcc
> env: XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- debug=y
> addons:
> --
> 2.4.10
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/3] travis: skip building coverity, smoke, and master
2016-03-04 20:09 [PATCH v2 1/3] travis: skip building coverity, smoke, and master Doug Goldstein
2016-03-04 20:09 ` [PATCH v2 2/3] travis: use matching C++ for GCC version Doug Goldstein
2016-03-04 20:09 ` [PATCH v2 3/3] travis: actually disable debug for non-debug Doug Goldstein
@ 2016-03-07 15:18 ` Konrad Rzeszutek Wilk
2 siblings, 0 replies; 5+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-03-07 15:18 UTC (permalink / raw)
To: Doug Goldstein
Cc: Keir Fraser, Tim Deegan, Ian Jackson, xen-devel, Jan Beulich,
Andrew Cooper
On Fri, Mar 04, 2016 at 02:09:46PM -0600, Doug Goldstein wrote:
> Skip building of the coverity, smoke, stable, and master branches since
> they just fast forward from staging.
>
> Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
and applied.
> ---
> CC: Ian Jackson <ian.jackson@eu.citrix.com>
> CC: Jan Beulich <jbeulich@suse.com>
> CC: Keir Fraser <keir@xen.org>
> CC: Tim Deegan <tim@xen.org>
> CC: Andrew Cooper <andrew.cooper3@citrix.com>
>
> change since v1:
> - ignore all coverity tested branches
> - ignore stable branches as well
> ---
> .travis.yml | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/.travis.yml b/.travis.yml
> index 6693af2..6803e2f 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -1,6 +1,13 @@
> language: c
> dist: trusty
> sudo: required
> +# don't test master, smoke and coverity branches
> +branches:
> + except:
> + - master
> + - smoke
> + - /^coverity-tested\/.*/
> + - /^stable-.*/
> matrix:
> include:
> - compiler: gcc
> --
> 2.4.10
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-07 15:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-04 20:09 [PATCH v2 1/3] travis: skip building coverity, smoke, and master Doug Goldstein
2016-03-04 20:09 ` [PATCH v2 2/3] travis: use matching C++ for GCC version Doug Goldstein
2016-03-04 20:09 ` [PATCH v2 3/3] travis: actually disable debug for non-debug Doug Goldstein
2016-03-07 15:32 ` Konrad Rzeszutek Wilk
2016-03-07 15:18 ` [PATCH v2 1/3] travis: skip building coverity, smoke, and master Konrad Rzeszutek Wilk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).