1bf6609652
- migration: Skip only empty block devicesi - iotests: adapt to output change for recently introduced 'detached hea… - travis-ci: Rename SOFTMMU -> SYSTEM - block: disallow block jobs when there is a BDRV_O_INACTIVE flag - [backup] memory: bakcup hugepages: hugepages files maybe leftover - memory: [backup] Modify the VM's physical bits value set policy. - ui/clipboard: mark type as not available when there is no data (CVE-2023-6683) - virtio-net: correctly copy vnet header when flushing TX (CVE-2023-6693) Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
From c03415f3b75e6a37c7eb392ef62bf92b94267b4d Mon Sep 17 00:00:00 2001
|
|
From: gaojiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 25 Mar 2024 17:26:52 +0800
|
|
Subject: [PATCH] travis-ci: Rename SOFTMMU -> SYSTEM
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from 47833f817cc597db124c690bd14600bb5d00e824
|
|
|
|
Since we *might* have user emulation with softmmu,
|
|
rename MAIN_SOFTMMU_TARGETS as MAIN_SYSTEM_TARGETS
|
|
to express 'system emulation targets'.
|
|
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Message-ID: <20240313213339.82071-3-philmd@linaro.org>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
Signed-off-by: Gao Jiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
|
---
|
|
.travis.yml | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/.travis.yml b/.travis.yml
|
|
index 76859d48da..597d151b80 100644
|
|
--- a/.travis.yml
|
|
+++ b/.travis.yml
|
|
@@ -35,7 +35,7 @@ env:
|
|
- TEST_BUILD_CMD=""
|
|
- TEST_CMD="make check V=1"
|
|
# This is broadly a list of "mainline" system targets which have support across the major distros
|
|
- - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
|
|
+ - MAIN_SYSTEM_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
|
|
- CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime"
|
|
- CCACHE_MAXSIZE=1G
|
|
- G_MESSAGES_DEBUG=error
|
|
@@ -114,7 +114,7 @@ jobs:
|
|
env:
|
|
- TEST_CMD="make check check-tcg V=1"
|
|
- CONFIG="--disable-containers --enable-fdt=system
|
|
- --target-list=${MAIN_SOFTMMU_TARGETS} --cxx=/bin/false"
|
|
+ --target-list=${MAIN_SYSTEM_TARGETS} --cxx=/bin/false"
|
|
- UNRELIABLE=true
|
|
|
|
- name: "[ppc64] GCC check-tcg"
|
|
@@ -185,7 +185,7 @@ jobs:
|
|
env:
|
|
- TEST_CMD="make check check-tcg V=1"
|
|
- CONFIG="--disable-containers --enable-fdt=system
|
|
- --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
|
|
+ --target-list=${MAIN_SYSTEM_TARGETS},s390x-linux-user"
|
|
- UNRELIABLE=true
|
|
script:
|
|
- BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
|
|
@@ -226,7 +226,7 @@ jobs:
|
|
- genisoimage
|
|
env:
|
|
- CONFIG="--disable-containers --enable-fdt=system --audio-drv-list=sdl
|
|
- --disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
|
|
+ --disable-user --target-list-exclude=${MAIN_SYSTEM_TARGETS}"
|
|
|
|
- name: "[s390x] GCC (user)"
|
|
arch: s390x
|
|
--
|
|
2.27.0
|
|
|