From: Peter Maydell <peter.maydell@linaro.org>
Date: Sun, 14 Mar 2021 15:13:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-03-12'... 
X-Git-Tag: v6.0.0-rc0~42
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=757acb9a8295e8be4a37b2cfc1cd947e357fd29c;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-03-12' into staging

* Move unit and bench tests into separate directories
* Clean-up and improve gitlab-ci jobs
* Drop the non-working "check-speed" makefile target
* Minor documentation updates

# gpg: Signature made Fri 12 Mar 2021 17:18:45 GMT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/thuth-gitlab/tags/pull-request-2021-03-12:
  README: Add Documentation blurb
  MAINTAINERS: Merge the Gitlab-CI section into the generic CI section
  tests: remove "make check-speed" in favor of "make bench"
  gitlab-ci.yml: Merge check-crypto-old jobs into the build-crypto-old jobs
  gitlab-ci.yml: Merge one of the coroutine jobs with the tcg-disabled job
  gitlab-ci.yml: Add some missing dependencies to the jobs
  gitlab-ci.yml: Move build-tools-and-docs-debian to a better place
  tests: Move benchmarks into a separate folder
  tests: Move unit tests into a separate directory

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

757acb9a8295e8be4a37b2cfc1cd947e357fd29c
diff --cc .gitlab-ci.yml
index 293a810656,0ada3dbb90..f65cb11c4d
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -485,127 -475,10 +479,129 @@@ clang-user
        --extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined
      MAKE_CHECK_ARGS: check-unit check-tcg
  
 +# Set LD_JOBS=1 because this requires LTO and ld consumes a large amount of memory.
 +# On gitlab runners, default value sometimes end up calling 2 lds concurrently and
 +# triggers an Out-Of-Memory error
 +#
 +# Since slirp callbacks are used in QEMU Timers, slirp needs to be compiled together
 +# with QEMU and linked as a static library to avoid false positives in CFI checks.
 +# This can be accomplished by using -enable-slirp=git, which avoids the use of
 +# a system-wide version of the library
 +#
 +# Split in three sets of build/check/acceptance to limit the execution time of each
 +# job
 +build-cfi-aarch64:
 +  <<: *native_build_job_definition
 +  needs:
 +  - job: amd64-fedora-container
 +  variables:
 +    LD_JOBS: 1
 +    AR: llvm-ar
 +    IMAGE: fedora
 +    CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug
 +      --enable-safe-stack --enable-slirp=git
 +    TARGETS: aarch64-softmmu
 +    MAKE_CHECK_ARGS: check-build
 +  artifacts:
 +    expire_in: 2 days
 +    paths:
 +      - build
 +
 +check-cfi-aarch64:
 +  <<: *native_test_job_definition
 +  needs:
 +    - job: build-cfi-aarch64
 +      artifacts: true
 +  variables:
 +    IMAGE: fedora
 +    MAKE_CHECK_ARGS: check
 +
 +acceptance-cfi-aarch64:
 +  <<: *native_test_job_definition
 +  needs:
 +    - job: build-cfi-aarch64
 +      artifacts: true
 +  variables:
 +    IMAGE: fedora
 +    MAKE_CHECK_ARGS: check-acceptance
 +  <<: *acceptance_definition
 +
 +build-cfi-ppc64-s390x:
 +  <<: *native_build_job_definition
 +  needs:
 +  - job: amd64-fedora-container
 +  variables:
 +    LD_JOBS: 1
 +    AR: llvm-ar
 +    IMAGE: fedora
 +    CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug
 +      --enable-safe-stack --enable-slirp=git
 +    TARGETS: ppc64-softmmu s390x-softmmu
 +    MAKE_CHECK_ARGS: check-build
 +  artifacts:
 +    expire_in: 2 days
 +    paths:
 +      - build
 +
 +check-cfi-ppc64-s390x:
 +  <<: *native_test_job_definition
 +  needs:
 +    - job: build-cfi-ppc64-s390x
 +      artifacts: true
 +  variables:
 +    IMAGE: fedora
 +    MAKE_CHECK_ARGS: check
 +
 +acceptance-cfi-ppc64-s390x:
 +  <<: *native_test_job_definition
 +  needs:
 +    - job: build-cfi-ppc64-s390x
 +      artifacts: true
 +  variables:
 +    IMAGE: fedora
 +    MAKE_CHECK_ARGS: check-acceptance
 +  <<: *acceptance_definition
 +
 +build-cfi-x86_64:
 +  <<: *native_build_job_definition
 +  needs:
 +  - job: amd64-fedora-container
 +  variables:
 +    LD_JOBS: 1
 +    AR: llvm-ar
 +    IMAGE: fedora
 +    CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug
 +      --enable-safe-stack --enable-slirp=git
 +    TARGETS: x86_64-softmmu
 +    MAKE_CHECK_ARGS: check-build
 +  artifacts:
 +    expire_in: 2 days
 +    paths:
 +      - build
 +
 +check-cfi-x86_64:
 +  <<: *native_test_job_definition
 +  needs:
 +    - job: build-cfi-x86_64
 +      artifacts: true
 +  variables:
 +    IMAGE: fedora
 +    MAKE_CHECK_ARGS: check
 +
 +acceptance-cfi-x86_64:
 +  <<: *native_test_job_definition
 +  needs:
 +    - job: build-cfi-x86_64
 +      artifacts: true
 +  variables:
 +    IMAGE: fedora
 +    MAKE_CHECK_ARGS: check-acceptance
 +  <<: *acceptance_definition
 +
  tsan-build:
    <<: *native_build_job_definition
+   needs:
+     job: amd64-ubuntu2004-container
    variables:
      IMAGE: ubuntu2004
      CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 --disable-docs