diff mbox series

[PULL,31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64

Message ID 20190910084349.28817-32-alex.bennee@linaro.org
State Accepted
Commit e5389e44147e4c8d652006ed086c48f74684726a
Headers show
Series testing updates (fixes, upgrades, caching) | expand

Commit Message

Alex Bennée Sept. 10, 2019, 8:43 a.m. UTC 
This prevents us trying to do builds which we can't complete.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.20.1

Comments

Philippe Mathieu-Daudé Sept. 19, 2019, 8:18 p.m. UTC | #1 
Hi Alex,

On 9/10/19 10:43 AM, Alex Bennée wrote:
> This prevents us trying to do builds which we can't complete.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> 

> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include

> index 7df8dbe1a17..50a400b573a 100644

> --- a/tests/docker/Makefile.include

> +++ b/tests/docker/Makefile.include

> @@ -106,6 +106,15 @@ docker-image-debian-s390x-cross: docker-image-debian9

>  docker-image-debian-win32-cross: docker-image-debian9-mxe

>  docker-image-debian-win64-cross: docker-image-debian9-mxe

>  

> +# For non-x86 hosts not all cross-compilers have been packaged

> +ifneq ($(ARCH),x86_64)

> +DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross

> +DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross

> +DOCKER_PARTIAL_IMAGES += debian-s390x-cross

> +DOCKER_PARTIAL_IMAGES += debian-win32-cross debian-win64-cross

> +DOCKER_PARTIAL_IMAGES += fedora travis

> +endif

> +

>  docker-image-debian-alpha-cross: docker-image-debian10

>  docker-image-debian-arm64-cross: docker-image-debian10

>  docker-image-debian-hppa-cross: docker-image-debian10

> 


I wanted to run the Travis tests locally (per
docs/devel/testing.rst:364) but I got:

$ make docker-travis@travis
  LD      docker-travis@travis.mo
cc: fatal error: no input files
compilation terminated.
make: *** [rules.mak:118: docker-travis@travis.mo] Error 1

Bisected to this patch:

e5389e44147e4c8d652006ed086c48f74684726a is the first bad commit
commit e5389e44147e4c8d652006ed086c48f74684726a
Author: Alex Bennée <alex.bennee@linaro.org>
Date:   Thu Aug 15 19:40:48 2019 +0000

    tests/docker: add more images to PARTIAL_IMAGES when not on x86_64

    This prevents us trying to do builds which we can't complete.

Removing 'travis' from this list we get it working again.

Regards,

Phil.
Alex Bennée Sept. 20, 2019, 6:23 a.m. UTC | #2 
Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> Hi Alex,

>

> On 9/10/19 10:43 AM, Alex Bennée wrote:

>> This prevents us trying to do builds which we can't complete.

>>

>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

>>

>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include

>> index 7df8dbe1a17..50a400b573a 100644

>> --- a/tests/docker/Makefile.include

>> +++ b/tests/docker/Makefile.include

>> @@ -106,6 +106,15 @@ docker-image-debian-s390x-cross: docker-image-debian9

>>  docker-image-debian-win32-cross: docker-image-debian9-mxe

>>  docker-image-debian-win64-cross: docker-image-debian9-mxe

>>

>> +# For non-x86 hosts not all cross-compilers have been packaged

>> +ifneq ($(ARCH),x86_64)

>> +DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross

>> +DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross

>> +DOCKER_PARTIAL_IMAGES += debian-s390x-cross

>> +DOCKER_PARTIAL_IMAGES += debian-win32-cross debian-win64-cross

>> +DOCKER_PARTIAL_IMAGES += fedora travis

>> +endif

>> +

>>  docker-image-debian-alpha-cross: docker-image-debian10

>>  docker-image-debian-arm64-cross: docker-image-debian10

>>  docker-image-debian-hppa-cross: docker-image-debian10

>>

>

> I wanted to run the Travis tests locally (per

> docs/devel/testing.rst:364) but I got:

>

> $ make docker-travis@travis

>   LD      docker-travis@travis.mo

> cc: fatal error: no input files

> compilation terminated.

> make: *** [rules.mak:118: docker-travis@travis.mo] Error 1

>

> Bisected to this patch:

>

> e5389e44147e4c8d652006ed086c48f74684726a is the first bad commit

> commit e5389e44147e4c8d652006ed086c48f74684726a

> Author: Alex Bennée <alex.bennee@linaro.org>

> Date:   Thu Aug 15 19:40:48 2019 +0000

>

>     tests/docker: add more images to PARTIAL_IMAGES when not on x86_64

>

>     This prevents us trying to do builds which we can't complete.

>

> Removing 'travis' from this list we get it working again.


Have you run configure? I had to work around this in shippable:

    # usually host ARCH is set by configure
    - echo "ARCH=$(uname -m)" > config-host.mak

I guess more logic could be put in if the ARCH is empty

>

> Regards,

>

> Phil.



--
Alex Bennée
diff mbox series

Patch

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 7df8dbe1a17..50a400b573a 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -106,6 +106,15 @@  docker-image-debian-s390x-cross: docker-image-debian9
 docker-image-debian-win32-cross: docker-image-debian9-mxe
 docker-image-debian-win64-cross: docker-image-debian9-mxe
 
+# For non-x86 hosts not all cross-compilers have been packaged
+ifneq ($(ARCH),x86_64)
+DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross
+DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross
+DOCKER_PARTIAL_IMAGES += debian-s390x-cross
+DOCKER_PARTIAL_IMAGES += debian-win32-cross debian-win64-cross
+DOCKER_PARTIAL_IMAGES += fedora travis
+endif
+
 docker-image-debian-alpha-cross: docker-image-debian10
 docker-image-debian-arm64-cross: docker-image-debian10
 docker-image-debian-hppa-cross: docker-image-debian10