diff mbox series

.travis.yml: separate tools and docs into another entry

Message ID 20190201171229.3361-1-alex.bennee@linaro.org
State New
Headers show
Series .travis.yml: separate tools and docs into another entry | expand

Commit Message

Alex Bennée Feb. 1, 2019, 5:12 p.m. UTC
Re-building the tools and documents by default is a little wasteful as
they are not really affected by the main build options. Split tools
and documents into their own task with a minimal softmmu and
linux-user target list just to check they don't interact badly.

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

Comments

no-reply@patchew.org Feb. 3, 2019, 3:34 p.m. UTC | #1
Patchew URL: https://patchew.org/QEMU/20190201171229.3361-1-alex.bennee@linaro.org/



Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14
=== TEST SCRIPT END ===


Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install --python=/usr/bin/python3 --cross-prefix=x86_64-w64-mingw32- --enable-trace-backends=simple --enable-gnutls --enable-nettle --enable-curl --enable-vnc --enable-bzip2 --enable-guest-agent --with-sdlabi=2.0
ERROR: unknown option --with-sdlabi=2.0
Try '/tmp/qemu-test/src/configure --help' for more information
# QEMU configure log Sun Feb  3 15:33:56 UTC 2019
# Configured with: '/tmp/qemu-test/src/configure' '--enable-werror' '--target-list=x86_64-softmmu,aarch64-softmmu' '--prefix=/tmp/qemu-test/install' '--python=/usr/bin/python3' '--cross-prefix=x86_64-w64-mingw32-' '--enable-trace-backends=simple' '--enable-gnutls' '--enable-nettle' '--enable-curl' '--enable-vnc' '--enable-bzip2' '--enable-guest-agent' '--with-sdlabi=2.0'
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 634 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c
config-temp/qemu-conf.c:2:2: error: #error __linux__ not defined
 #error __linux__ not defined
  ^~~~~

---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 686 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c
config-temp/qemu-conf.c:2:2: error: #error __i386__ not defined
 #error __i386__ not defined
  ^~~~~

---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 689 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c
config-temp/qemu-conf.c:2:2: error: #error __ILP32__ not defined
 #error __ILP32__ not defined
  ^~~~~

---
lines: 92 128 920 0
x86_64-w64-mingw32-gcc -mthreads -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -o config-temp/qemu-conf.exe config-temp/qemu-conf.c -g -liberty
/usr/lib/gcc/x86_64-w64-mingw32/8.2.0/../../../../x86_64-w64-mingw32/bin/ld: cannot find -liberty
collect2: error: ld returned 1 exit status
Failed to run 'configure'
Traceback (most recent call last):
  File "./tests/docker/docker.py", line 563, in <module>


The full log is available at
http://patchew.org/logs/20190201171229.3361-1-alex.bennee@linaro.org/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Alex Bennée Feb. 4, 2019, 8:28 a.m. UTC | #2
no-reply@patchew.org writes:

> Patchew URL: https://patchew.org/QEMU/20190201171229.3361-1-alex.bennee@linaro.org/
>
>
>
> Hi,
>
> This series failed the docker-mingw@fedora build test. Please find the testing commands and
> their output below. If you have Docker installed, you can probably reproduce it
> locally.
>
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> time make docker-test-mingw@fedora SHOW_ENV=1 J=14
> === TEST SCRIPT END ===
>
>
> Configure options:
> --enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install --python=/usr/bin/python3 --cross-prefix=x86_64-w64-mingw32- --enable-trace-backends=simple --enable-gnutls --enable-nettle --enable-curl --enable-vnc --enable-bzip2 --enable-guest-agent --with-sdlabi=2.0
> ERROR: unknown option --with-sdlabi=2.0
> Try '/tmp/qemu-test/src/configure --help' for more information

That looks like patchew is confused.

--
Alex Bennée
Philippe Mathieu-Daudé Feb. 4, 2019, 12:04 p.m. UTC | #3
Hi Alex,

On 2/1/19 6:12 PM, Alex Bennée wrote:
> Re-building the tools and documents by default is a little wasteful as
> they are not really affected by the main build options. Split tools
> and documents into their own task with a minimal softmmu and
> linux-user target list just to check they don't interact badly.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  .travis.yml | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 87d9fa971c..1c8effcf63 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -61,6 +61,7 @@ env:
>    global:
>      - SRC_DIR="."
>      - BUILD_DIR="."
> +    - BASE_CONFIG="--disable-docs --disable-tools"
>      - TEST_CMD="make check -j3 V=1"
>  
>  
> @@ -71,7 +72,7 @@ git:
>  
>  before_script:
>    - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
> -  - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }
> +  - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
>  script:
>    - make -j3 && ${TEST_CMD}
>  
> @@ -106,6 +107,15 @@ matrix:
>          - CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
>  
>  
> +    # Check we can build docs and tools
> +    - env:
> +        - BASE_CONFIG=""

What about using explicit configure options?

   BASE_CONFIG="--enable-docs --enable-tools"

Regardless:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> +        - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user"
> +      addons:
> +        apt:
> +          packages:
> +            - python-sphinx
> +
>      # Test out-of-tree builds
>      - env:
>          - CONFIG="--enable-debug --enable-debug-tcg"
> @@ -243,5 +253,5 @@ matrix:
>  
>  
>      - env:
> -        - CONFIG="--disable-system --disable-docs"
> +        - CONFIG="--disable-system"
>          - TEST_CMD="make -j3 check-tcg V=1"
>
Alex Bennée Feb. 4, 2019, 12:59 p.m. UTC | #4
Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> Hi Alex,
>
> On 2/1/19 6:12 PM, Alex Bennée wrote:
>> Re-building the tools and documents by default is a little wasteful as
>> they are not really affected by the main build options. Split tools
>> and documents into their own task with a minimal softmmu and
>> linux-user target list just to check they don't interact badly.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>  .travis.yml | 14 ++++++++++++--
>>  1 file changed, 12 insertions(+), 2 deletions(-)
>>
>> diff --git a/.travis.yml b/.travis.yml
>> index 87d9fa971c..1c8effcf63 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -61,6 +61,7 @@ env:
>>    global:
>>      - SRC_DIR="."
>>      - BUILD_DIR="."
>> +    - BASE_CONFIG="--disable-docs --disable-tools"
>>      - TEST_CMD="make check -j3 V=1"
>>
>>
>> @@ -71,7 +72,7 @@ git:
>>
>>  before_script:
>>    - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
>> -  - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }
>> +  - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
>>  script:
>>    - make -j3 && ${TEST_CMD}
>>
>> @@ -106,6 +107,15 @@ matrix:
>>          - CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
>>
>>
>> +    # Check we can build docs and tools
>> +    - env:
>> +        - BASE_CONFIG=""
>
> What about using explicit configure options?
>
>    BASE_CONFIG="--enable-docs --enable-tools"

Will add for clarity (although not effect ;-)

>
> Regardless:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
>> +        - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user"
>> +      addons:
>> +        apt:
>> +          packages:
>> +            - python-sphinx
>> +
>>      # Test out-of-tree builds
>>      - env:
>>          - CONFIG="--enable-debug --enable-debug-tcg"
>> @@ -243,5 +253,5 @@ matrix:
>>
>>
>>      - env:
>> -        - CONFIG="--disable-system --disable-docs"
>> +        - CONFIG="--disable-system"
>>          - TEST_CMD="make -j3 check-tcg V=1"
>>


--
Alex Bennée
Philippe Mathieu-Daudé Feb. 4, 2019, 1:01 p.m. UTC | #5
On 2/4/19 1:59 PM, Alex Bennée wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>> On 2/1/19 6:12 PM, Alex Bennée wrote:
>>> Re-building the tools and documents by default is a little wasteful as
>>> they are not really affected by the main build options. Split tools
>>> and documents into their own task with a minimal softmmu and
>>> linux-user target list just to check they don't interact badly.
>>>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>>  .travis.yml | 14 ++++++++++++--
>>>  1 file changed, 12 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/.travis.yml b/.travis.yml
>>> index 87d9fa971c..1c8effcf63 100644
>>> --- a/.travis.yml
>>> +++ b/.travis.yml
>>> @@ -61,6 +61,7 @@ env:
>>>    global:
>>>      - SRC_DIR="."
>>>      - BUILD_DIR="."
>>> +    - BASE_CONFIG="--disable-docs --disable-tools"
>>>      - TEST_CMD="make check -j3 V=1"
>>>
>>>
>>> @@ -71,7 +72,7 @@ git:
>>>
>>>  before_script:
>>>    - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
>>> -  - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }
>>> +  - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
>>>  script:
>>>    - make -j3 && ${TEST_CMD}
>>>
>>> @@ -106,6 +107,15 @@ matrix:
>>>          - CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
>>>
>>>
>>> +    # Check we can build docs and tools
>>> +    - env:
>>> +        - BASE_CONFIG=""
>>
>> What about using explicit configure options?
>>
>>    BASE_CONFIG="--enable-docs --enable-tools"
> 
> Will add for clarity (although not effect ;-)

The effect will be in 10 months when I'll look at this again :P

Thanks!

>>
>> Regardless:
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>>> +        - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user"
>>> +      addons:
>>> +        apt:
>>> +          packages:
>>> +            - python-sphinx
>>> +
>>>      # Test out-of-tree builds
>>>      - env:
>>>          - CONFIG="--enable-debug --enable-debug-tcg"
>>> @@ -243,5 +253,5 @@ matrix:
>>>
>>>
>>>      - env:
>>> -        - CONFIG="--disable-system --disable-docs"
>>> +        - CONFIG="--disable-system"
>>>          - TEST_CMD="make -j3 check-tcg V=1"
>>>
> 
> 
> --
> Alex Bennée
>
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index 87d9fa971c..1c8effcf63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,6 +61,7 @@  env:
   global:
     - SRC_DIR="."
     - BUILD_DIR="."
+    - BASE_CONFIG="--disable-docs --disable-tools"
     - TEST_CMD="make check -j3 V=1"
 
 
@@ -71,7 +72,7 @@  git:
 
 before_script:
   - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
-  - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; }
+  - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
 script:
   - make -j3 && ${TEST_CMD}
 
@@ -106,6 +107,15 @@  matrix:
         - CONFIG="--with-coroutine=sigaltstack --disable-linux-user"
 
 
+    # Check we can build docs and tools
+    - env:
+        - BASE_CONFIG=""
+        - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user"
+      addons:
+        apt:
+          packages:
+            - python-sphinx
+
     # Test out-of-tree builds
     - env:
         - CONFIG="--enable-debug --enable-debug-tcg"
@@ -243,5 +253,5 @@  matrix:
 
 
     - env:
-        - CONFIG="--disable-system --disable-docs"
+        - CONFIG="--disable-system"
         - TEST_CMD="make -j3 check-tcg V=1"