[Qemu-commits] [qemu/qemu] 73acb8: configure: Fix check-tcg not executing any tests

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 73acb87be536d23e42db73a306104d8fd316ff20
      
https://github.com/qemu/qemu/commit/73acb87be536d23e42db73a306104d8fd316ff20
  Author: Mukilan Thiyagarajan <quic_mthiyaga@quicinc.com>
  Date:   2022-12-23 (Fri, 23 Dec 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Fix check-tcg not executing any tests

After configuring with --target-list=hexagon-linux-user
running `make check-tcg` just prints the following:

```
make: Nothing to be done for 'check-tcg'
```

In the probe_target_compiler function, the 'break'
command is used incorrectly. There are no lexically
enclosing loops associated with that break command which
is an unspecfied behaviour in the POSIX standard.

The dash shell implementation aborts the currently executing
loop, in this case, causing the rest of the logic for the loop
in line 2490 to be skipped, which means no Makefiles are
generated for the tcg target tests.

Fixes: c3b570b5a9a24d25 (configure: don't enable
cross compilers unless in target_list)

Signed-off-by: Mukilan Thiyagarajan <quic_mthiyaga@quicinc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Link: 
https://patchew.org/QEMU/20221207082309.9966-1-quic._5Fmthiyaga@quicinc.com/
Message-Id: <20221207082309.9966-1-quic_mthiyaga@quicinc.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221221090411.1995037-2-alex.bennee@linaro.org>


  Commit: fb83fd3b843e894842282eb3054b43d3eae833db
      
https://github.com/qemu/qemu/commit/fb83fd3b843e894842282eb3054b43d3eae833db
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-12-23 (Fri, 23 Dec 2022)

  Changed paths:
    M .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
    M .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
    M .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml

  Log Message:
  -----------
  gitlab: turn off verbose logging for make check on custom runners

The verbosity adds a lot of unnecessary output to the CI logs which
end up getting truncated anyway. We can always extract information
from the meson test logs on a failure and for the custom runners its
generally easier to re-create failures anyway.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20221221090411.1995037-3-alex.bennee@linaro.org>


  Commit: 7f788779458e0ab8ffeecab42e9b269e98ec9a86
      
https://github.com/qemu/qemu/commit/7f788779458e0ab8ffeecab42e9b269e98ec9a86
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-12-23 (Fri, 23 Dec 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: repeat ourselves for the benefit of CI

Our CI system echos the lines it executes but not the expansions. For
the sake of a line of extra verbosity during the configure phase lets
echo the invocation of script to stdout as well as the log when on CI.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221221090411.1995037-4-alex.bennee@linaro.org>


  Commit: 2bc6c79417b89c3306b724577e775f03fe61fb2e
      
https://github.com/qemu/qemu/commit/2bc6c79417b89c3306b724577e775f03fe61fb2e
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-12-23 (Fri, 23 Dec 2022)

  Changed paths:
    M tests/tcg/multiarch/linux/linux-test.c

  Log Message:
  -----------
  tests/tcg: fix unused variable in linux-test

The latest hexagon compiler picks up that we never consume wcount.
Given the name of the #define that rcount checks against is WCOUNT_MAX
I figured the check just got missed.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221221090411.1995037-5-alex.bennee@linaro.org>


  Commit: b9052d36342c947b36447558ed0a0dd3fb3fb8f4
      
https://github.com/qemu/qemu/commit/b9052d36342c947b36447558ed0a0dd3fb3fb8f4
  Author: Mukilan Thiyagarajan <quic_mthiyaga@quicinc.com>
  Date:   2022-12-23 (Fri, 23 Dec 2022)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml
    M .gitlab-ci.d/container-cross.yml
    M MAINTAINERS
    M tests/docker/Makefile.include
    R tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh
    M tests/docker/dockerfiles/debian-hexagon-cross.docker

  Log Message:
  -----------
  tests/docker: use prebuilt toolchain for debian-hexagon-cross

The current docker image for cross compiling hexagon guests
is manually built since it takes >2 hours to build from source.

This patch:
 1. Solves the above issue by using the prebuilt clang
    toolchain hosted on CodeLinaro [1] and maintained by QUIC [2].
 2. The dockerfile is also switched from multi-stage to single stage
    build to allow the CI docker engine to reuse the layer cache.
 3. Re-enables the hexagon-cross-container job to be always run in
    CI and makes it a non-optional dependency for the
    build-user-hexagon job.

The changes for 1 & 2 together bring down the build time to
~3 minutes in GitLab CI when cache is reused and ~9 minutes
when cache cannot be reused.

[1]: https://github.com/CodeLinaro/hexagon-builder
[2]: https://github.com/quic/toolchain_for_hexagon/releases/

Signed-off-by: Mukilan Thiyagarajan <quic_mthiyaga@quicinc.com>
[AJB: also tweak MAINTAINERS, remove QEMU_JOB_ONLY_FORKS and comment]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221219144354.11659-1-quic_mthiyaga@quicinc.com>
Message-Id: <20221221090411.1995037-6-alex.bennee@linaro.org>


  Commit: 3b4f911921e4233df0ba78d4acd2077da0b144ef
      
https://github.com/qemu/qemu/commit/3b4f911921e4233df0ba78d4acd2077da0b144ef
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-12-23 (Fri, 23 Dec 2022)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml

  Log Message:
  -----------
  gitlab-ci: Disable docs and GUIs for the build-tci and build-tcg-disabled jobs

These jobs use their own "script:" section and thus do not profit from
the global "--disable-docs" from the template. While we're at it, disable
also some GUI front ends here since we do not gain any additional test
coverage by compiling those here again.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20221208135945.99975-1-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221221090411.1995037-7-alex.bennee@linaro.org>


  Commit: 2782f45985cb1530d3d9dcc86746db5d127c38dc
      
https://github.com/qemu/qemu/commit/2782f45985cb1530d3d9dcc86746db5d127c38dc
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-01-03 (Tue, 03 Jan 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml
    M .gitlab-ci.d/container-cross.yml
    M .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
    M .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
    M .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
    M MAINTAINERS
    M configure
    M tests/docker/Makefile.include
    R tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh
    M tests/docker/dockerfiles/debian-hexagon-cross.docker
    M tests/tcg/multiarch/linux/linux-test.c

  Log Message:
  -----------
  Merge tag 'pull-testing-next-231222-1' of https://gitlab.com/stsquad/qemu 
into staging

testing updates:

  - fix minor shell-ism that can break check-tcg
  - turn off verbose logging on custom runners
  - make configure echo call in CI
  - fix unused variable in linux-test
  - add binary compiler docker image for hexagon
  - disable doc and gui builds for tci and disable-tcg builds

# gpg: Signature made Fri 23 Dec 2022 15:18:41 GMT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) 
<alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* tag 'pull-testing-next-231222-1' of https://gitlab.com/stsquad/qemu:
  gitlab-ci: Disable docs and GUIs for the build-tci and build-tcg-disabled jobs
  tests/docker: use prebuilt toolchain for debian-hexagon-cross
  tests/tcg: fix unused variable in linux-test
  configure: repeat ourselves for the benefit of CI
  gitlab: turn off verbose logging for make check on custom runners
  configure: Fix check-tcg not executing any tests

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/3f4012b13cda...2782f45985cb