On 11/8/20 6:45 PM, Philippe Mathieu-Daudé wrote:
> Similarly to commit 8cdb2cef3f1, move the linux-user (debug-tcg)
> test to GitLab.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Cc: Laurent Vivier <laurent@vivier.eu>
> ---
> .gitlab-ci.yml | 7 +++++++
> .travis.yml | 9 ---------
> 2 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 3fc3d0568c6..80082a602b8 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -304,6 +304,13 @@ build-user:
> CONFIGURE_ARGS: --disable-tools --disable-system
> MAKE_CHECK_ARGS: check-tcg
>
> +build-user-debug:
> + <<: *native_build_job_definition
> + variables:
> + IMAGE: debian-all-test-cross
> + CONFIGURE_ARGS: --disable-tools --disable-system --enable-debug-tcg
> + MAKE_CHECK_ARGS: check-tcg
> +
It would be useful a variable like 'MAKE_BUILD_ARGS' so that we could
overwrite the default make target (as in the diff below). So that here
it would eval to `make -j"$JOBS" build-tcg` as is done in Travis CI.
On the absence of such as variable,
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b15ae5c30..27517afd22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ include:
else
../configure --enable-werror $CONFIGURE_ARGS ;
fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
- - make -j"$JOBS"
+ - make -j"$JOBS" "$MAKE_BUILD_ARGS"
- if test -n "$MAKE_CHECK_ARGS";
then
make -j"$JOBS" $MAKE_CHECK_ARGS ;
> # Run check-tcg against linux-user (with plugins)
> # we skip sparc64-linux-user until it has been fixed somewhat
> # we skip cris-linux-user as it doesn't use the common run loop
> diff --git a/.travis.yml b/.travis.yml
> index 15d92291358..bee6197290d 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -293,15 +293,6 @@ jobs:
> - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; }
>
>
> - # Run check-tcg against linux-user
> - - name: "GCC check-tcg (user)"
> - env:
> - - CONFIG="--disable-system --enable-debug-tcg"
> - - TEST_BUILD_CMD="make build-tcg"
> - - TEST_CMD="make check-tcg"
> - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
> -
> -
> # Run check-tcg against softmmu targets
> - name: "GCC check-tcg (some-softmmu)"
> env: