* [PATCH 2/3] travis: use matching C++ for GCC version
2016-03-04 14:46 [PATCH 1/3] travis: skip building coverity, smoke, and master Doug Goldstein
@ 2016-03-04 14:46 ` Doug Goldstein
2016-03-04 14:46 ` [PATCH 3/3] travis: actually disable debug for non-debug Doug Goldstein
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Doug Goldstein @ 2016-03-04 14:46 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>
---
.travis.yml | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 74fa14e..f3d4b99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,20 +13,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
@@ -72,15 +72,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] 9+ messages in thread* [PATCH 3/3] travis: actually disable debug for non-debug
2016-03-04 14:46 [PATCH 1/3] travis: skip building coverity, smoke, and master Doug Goldstein
2016-03-04 14:46 ` [PATCH 2/3] travis: use matching C++ for GCC version Doug Goldstein
@ 2016-03-04 14:46 ` Doug Goldstein
2016-03-04 15:56 ` Doug Goldstein
2016-03-04 15:30 ` [PATCH 1/3] travis: skip building coverity, smoke, and master Andrew Cooper
2016-03-04 15:48 ` Jan Beulich
3 siblings, 1 reply; 9+ messages in thread
From: Doug Goldstein @ 2016-03-04 14:46 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>
---
.travis.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f3d4b99..0c93b4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,33 +10,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] 9+ messages in thread* Re: [PATCH 3/3] travis: actually disable debug for non-debug
2016-03-04 14:46 ` [PATCH 3/3] travis: actually disable debug for non-debug Doug Goldstein
@ 2016-03-04 15:56 ` Doug Goldstein
2016-03-04 18:28 ` Doug Goldstein
0 siblings, 1 reply; 9+ messages in thread
From: Doug Goldstein @ 2016-03-04 15:56 UTC (permalink / raw)
To: xen-devel
Cc: Keir Fraser, Andrew Cooper, Ian Jackson, Jan Beulich, Tim Deegan
[-- Attachment #1.1.1: Type: text/plain, Size: 869 bytes --]
On 3/4/16 8:46 AM, Doug Goldstein wrote:
> 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>
Here's a run with these 3 patches in them (the failures are due to
another patch that enables building the toolstack which currently fails
on Ubuntu):
https://travis-ci.org/cardoe/xen/builds/113561603
You can see that they won't cause regressions in the build process but
just to be pedantic I'm building just these 3 patches at:
https://travis-ci.org/cardoe/xen/builds/113693114
But it will take a bit to complete.
--
Doug Goldstein
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] travis: actually disable debug for non-debug
2016-03-04 15:56 ` Doug Goldstein
@ 2016-03-04 18:28 ` Doug Goldstein
0 siblings, 0 replies; 9+ messages in thread
From: Doug Goldstein @ 2016-03-04 18:28 UTC (permalink / raw)
To: xen-devel
Cc: Keir Fraser, Andrew Cooper, Ian Jackson, Jan Beulich, Tim Deegan
[-- Attachment #1.1.1: Type: text/plain, Size: 1041 bytes --]
On 3/4/16 9:56 AM, Doug Goldstein wrote:
> On 3/4/16 8:46 AM, Doug Goldstein wrote:
>> 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>
>
> Here's a run with these 3 patches in them (the failures are due to
> another patch that enables building the toolstack which currently fails
> on Ubuntu):
>
> https://travis-ci.org/cardoe/xen/builds/113561603
>
> You can see that they won't cause regressions in the build process but
> just to be pedantic I'm building just these 3 patches at:
>
> https://travis-ci.org/cardoe/xen/builds/113693114
>
> But it will take a bit to complete.
>
Full run: https://travis-ci.org/cardoe/xen/builds/113700670
That's with v2 of 1/3.
--
Doug Goldstein
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] travis: skip building coverity, smoke, and master
2016-03-04 14:46 [PATCH 1/3] travis: skip building coverity, smoke, and master Doug Goldstein
2016-03-04 14:46 ` [PATCH 2/3] travis: use matching C++ for GCC version Doug Goldstein
2016-03-04 14:46 ` [PATCH 3/3] travis: actually disable debug for non-debug Doug Goldstein
@ 2016-03-04 15:30 ` Andrew Cooper
2016-03-04 15:53 ` Doug Goldstein
2016-03-04 15:48 ` Jan Beulich
3 siblings, 1 reply; 9+ messages in thread
From: Andrew Cooper @ 2016-03-04 15:30 UTC (permalink / raw)
To: Doug Goldstein, xen-devel
Cc: Keir Fraser, Ian Jackson, Jan Beulich, Tim Deegan
On 04/03/16 14:46, Doug Goldstein wrote:
> Skip building of the coverity, smoke 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>
> ---
> .travis.yml | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/.travis.yml b/.travis.yml
> index 6693af2..74fa14e 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -1,6 +1,12 @@
> language: c
> dist: trusty
> sudo: required
> +# don't test master, smoke and coverity branches
> +branches:
> + except:
> + - master
> + - smoke
> + - coverity-tested/master
I would extend this to stable-* as well, as each stable-$X.$Y also
fast-forwards from staging-$X.$Y
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> matrix:
> include:
> - compiler: gcc
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] travis: skip building coverity, smoke, and master
2016-03-04 15:30 ` [PATCH 1/3] travis: skip building coverity, smoke, and master Andrew Cooper
@ 2016-03-04 15:53 ` Doug Goldstein
0 siblings, 0 replies; 9+ messages in thread
From: Doug Goldstein @ 2016-03-04 15:53 UTC (permalink / raw)
To: Andrew Cooper, xen-devel
Cc: Keir Fraser, Ian Jackson, Jan Beulich, Tim Deegan
[-- Attachment #1.1.1: Type: text/plain, Size: 1245 bytes --]
On 3/4/16 9:30 AM, Andrew Cooper wrote:
> On 04/03/16 14:46, Doug Goldstein wrote:
>> Skip building of the coverity, smoke 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>
>> ---
>> .travis.yml | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/.travis.yml b/.travis.yml
>> index 6693af2..74fa14e 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -1,6 +1,12 @@
>> language: c
>> dist: trusty
>> sudo: required
>> +# don't test master, smoke and coverity branches
>> +branches:
>> + except:
>> + - master
>> + - smoke
>> + - coverity-tested/master
>
> I would extend this to stable-* as well, as each stable-$X.$Y also
> fast-forwards from staging-$X.$Y
>
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
Will do. I'll post a v2 of this one patch for the same reasons I gave Jan.
--
Doug Goldstein
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] travis: skip building coverity, smoke, and master
2016-03-04 14:46 [PATCH 1/3] travis: skip building coverity, smoke, and master Doug Goldstein
` (2 preceding siblings ...)
2016-03-04 15:30 ` [PATCH 1/3] travis: skip building coverity, smoke, and master Andrew Cooper
@ 2016-03-04 15:48 ` Jan Beulich
2016-03-04 15:52 ` Doug Goldstein
3 siblings, 1 reply; 9+ messages in thread
From: Jan Beulich @ 2016-03-04 15:48 UTC (permalink / raw)
To: Doug Goldstein
Cc: Andrew Cooper, Tim Deegan, Keir Fraser, Ian Jackson, xen-devel
>>> On 04.03.16 at 15:46, <cardoe@cardoe.com> wrote:
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -1,6 +1,12 @@
> language: c
> dist: trusty
> sudo: required
> +# don't test master, smoke and coverity branches
> +branches:
> + except:
> + - master
> + - smoke
> + - coverity-tested/master
With the intention to perhaps make this (iirc) coverity-tested/smoke,
perhaps use a wildcard: coverity-tested/* ?
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] travis: skip building coverity, smoke, and master
2016-03-04 15:48 ` Jan Beulich
@ 2016-03-04 15:52 ` Doug Goldstein
0 siblings, 0 replies; 9+ messages in thread
From: Doug Goldstein @ 2016-03-04 15:52 UTC (permalink / raw)
To: Jan Beulich
Cc: Andrew Cooper, Tim Deegan, Keir Fraser, Ian Jackson, xen-devel
[-- Attachment #1.1.1: Type: text/plain, Size: 878 bytes --]
On 3/4/16 9:48 AM, Jan Beulich wrote:
>>>> On 04.03.16 at 15:46, <cardoe@cardoe.com> wrote:
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -1,6 +1,12 @@
>> language: c
>> dist: trusty
>> sudo: required
>> +# don't test master, smoke and coverity branches
>> +branches:
>> + except:
>> + - master
>> + - smoke
>> + - coverity-tested/master
>
> With the intention to perhaps make this (iirc) coverity-tested/smoke,
> perhaps use a wildcard: coverity-tested/* ?
>
> Jan
>
Yes. I can fix that up. Let me post a v2 and actually test it. They
don't use globbing or wildcards but instead "Ruby regular expression
syntax". I can't say I know Ruby so it might take one or two tries to
get the pattern right.
The other two patches in this series can be merged independently (3/3
does depend on 2/3).
--
Doug Goldstein
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread